singles: disable the new assert macro, not used here.

mosra · Jun 26, 2020 · c94269f · c94269f
1 parent 7094037
commit c94269f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/src/singles/CorradeArray.h b/src/singles/CorradeArray.h
@@ -52,10 +52,11 @@
    CORRADE_CONSTEXPR_ASSERT */
 #pragma ACME enable CORRADE_ASSERT
 #pragma ACME enable CORRADE_ASSERT_OUTPUT
+#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
 #pragma ACME enable CORRADE_INTERNAL_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_ASSERT_OUTPUT
-#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
+#pragma ACME enable CORRADE_INTERNAL_ASSERT_UNREACHABLE
 
 #ifndef CorradeArray_h
 #define CorradeArray_h

diff --git a/src/singles/CorradeArrayView.h b/src/singles/CorradeArrayView.h
@@ -53,10 +53,11 @@
    CORRADE_CONSTEXPR_ASSERT is used, wrapping the #include <cassert> above.
    When enabling additional asserts, be sure to update it above as well. */
 #pragma ACME enable CORRADE_ASSERT_OUTPUT
+#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
 #pragma ACME enable CORRADE_INTERNAL_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_ASSERT_OUTPUT
-#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
+#pragma ACME enable CORRADE_INTERNAL_ASSERT_UNREACHABLE
 
 #ifndef CorradeArrayView_h
 #define CorradeArrayView_h

diff --git a/src/singles/CorradeOptional.h b/src/singles/CorradeOptional.h
@@ -40,10 +40,11 @@
    update it above as well. */
 #pragma ACME enable CORRADE_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_ASSERT_OUTPUT
+#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
 #pragma ACME enable CORRADE_INTERNAL_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_ASSERT_OUTPUT
-#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
+#pragma ACME enable CORRADE_INTERNAL_ASSERT_UNREACHABLE
 
 #include "Corrade/Containers/Optional.h"
 #ifdef CORRADE_OPTIONAL_STL_COMPATIBILITY

diff --git a/src/singles/CorradePointer.h b/src/singles/CorradePointer.h
@@ -38,10 +38,11 @@
    update it above as well. */
 #pragma ACME enable CORRADE_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_ASSERT_OUTPUT
+#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
 #pragma ACME enable CORRADE_INTERNAL_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_ASSERT_OUTPUT
-#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
+#pragma ACME enable CORRADE_INTERNAL_ASSERT_UNREACHABLE
 
 #include "Corrade/Containers/Pointer.h"
 #ifdef CORRADE_POINTER_STL_COMPATIBILITY

diff --git a/src/singles/CorradeReference.h b/src/singles/CorradeReference.h
@@ -31,10 +31,11 @@
    even included. */
 #pragma ACME enable CORRADE_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_ASSERT_OUTPUT
+#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
 #pragma ACME enable CORRADE_INTERNAL_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_ASSERT_OUTPUT
-#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
+#pragma ACME enable CORRADE_INTERNAL_ASSERT_UNREACHABLE
 
 #include "Corrade/Containers/Reference.h"
 #ifdef CORRADE_POINTER_STL_COMPATIBILITY

diff --git a/src/singles/CorradeStridedArrayView.h b/src/singles/CorradeStridedArrayView.h
@@ -52,10 +52,11 @@
    CORRADE_CONSTEXPR_ASSERT */
 #pragma ACME enable CORRADE_ASSERT
 #pragma ACME enable CORRADE_ASSERT_OUTPUT
+#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
 #pragma ACME enable CORRADE_INTERNAL_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_CONSTEXPR_ASSERT
 #pragma ACME enable CORRADE_INTERNAL_ASSERT_OUTPUT
-#pragma ACME enable CORRADE_ASSERT_UNREACHABLE
+#pragma ACME enable CORRADE_INTERNAL_ASSERT_UNREACHABLE
 
 #ifndef CorradeStridedArrayView_h
 #define CorradeStridedArrayView_h