Fix C++20 compiler error when CESIUM_FORCE_ASSERTIONS is not defined.

CesiumGS · Nov 6, 2024 · 9c61641 · 9c61641
1 parent 89dfc44
commit 9c61641
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CesiumUtility/include/CesiumUtility/Assert.h b/CesiumUtility/include/CesiumUtility/Assert.h
@@ -1,13 +1,15 @@
 #pragma once
 
+#include <cstdint>
+
 //
 // Define our own assertion, so that users can forcebly turn them on if needed
 //
 #if defined CESIUM_FORCE_ASSERTIONS && defined NDEBUG
 // Asserts are defined in cassert and normally compiled out when NDEBUG is
 // defined. Redirect to our own assertion that can't be compiled out
 namespace CesiumUtility {
-void forceAssertFailure();
+std::int32_t forceAssertFailure();
 };
 #define CESIUM_ASSERT(expression)                                              \
   ((expression) ? 0 : CesiumUtility::forceAssertFailure())

diff --git a/CesiumUtility/src/Assert.cpp b/CesiumUtility/src/Assert.cpp
@@ -7,7 +7,10 @@
 #define NDEBUG
 
 namespace CesiumUtility {
-void forceAssertFailure() { assert(0 && "Assertion failed"); }
+std::int32_t forceAssertFailure() {
+  assert(0 && "Assertion failed");
+  return 1;
+}
 }; // namespace CesiumUtility
 
 #endif