Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -174,7 +174,10 @@ void CMemoryBlock::Uncompress(CMemoryBlock& toBlock) const
    toBlock.Allocate(m_uncompressedSize);
    toBlock.m_uncompressedSize = 0;
    unsigned long destSize = m_uncompressedSize;
-    int result = uncompress((unsigned char*)toBlock.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), GetSize());
+#if !defined(NDEBUG)
+    int result =
+#endif
+        uncompress((unsigned char*)toBlock.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), GetSize());
    assert(result == Z_OK);
    assert(destSize == m_uncompressedSize);
 }