Integrating github/staging through commit ab87ed9

Code/CryEngine/CryCommon/CryThreadSafeRendererContainer.h

@@ -466,7 +466,9 @@ inline void CThreadSafeRendererContainer<T>::CoalesceMemory()
     // mark state as not accessable
     m_bElementAccessSafe = false;
 
+#if !defined(NDEBUG)
     size_t nOldSize = m_nSize;
+#endif
 
     // compute required memory
     size_t nRequieredElements = 0;
@@ -542,7 +544,7 @@ inline CThreadSafeRendererContainer<T>::CMemoryPage::CMemoryPage()
     nMemoryBlockBegin = (nMemoryBlockBegin + nObjectAlignment - 1) & ~(nObjectAlignment - 1);
 
     // compute number of avaible elements
-    assert((nMemoryBlockEnd - nMemoryBlockBegin) > 0);
+    assert(nMemoryBlockEnd > nMemoryBlockBegin);
     m_nCapacity = (LONG)((nMemoryBlockEnd - nMemoryBlockBegin) / sizeof(T));
 
     // store pointer to store data to