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
@@ -527,7 +527,10 @@ inline void CryHeapCheck()
    #define AZ_RESTRICTED_SECTION PLATFORM_H_SECTION_11
    #include AZ_RESTRICTED_FILE(platform_h)
 #elif !defined(LINUX) && !defined(APPLE) // todo: this might be readded with later xdks?
-    int Result = _heapchk();
+#if !defined(NDEBUG)
+    int Result =
+#endif
+        _heapchk();
    assert(Result != _HEAPBADBEGIN);
    assert(Result != _HEAPBADNODE);
    assert(Result != _HEAPBADPTR);