config: move ENTT_CONSTEVAL to config.h

skypjack · Jan 17, 2025 · d1abac2 · d1abac2
1 parent 12b0a86
commit d1abac2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/entt/config/config.h b/src/entt/config/config.h
@@ -17,6 +17,18 @@
 #    define ENTT_CATCH if(false)
 #endif
 
+#if __has_include(<version>)
+#    include <version>
+#
+#    if defined(__cpp_consteval)
+#        define ENTT_CONSTEVAL consteval
+#    endif
+#endif
+
+#ifndef ENTT_CONSTEVAL
+#    define ENTT_CONSTEVAL constexpr
+#endif
+
 #ifdef ENTT_USE_ATOMIC
 #    include <atomic>
 #    define ENTT_MAYBE_ATOMIC(Type) std::atomic<Type>

diff --git a/src/entt/config/macro.h b/src/entt/config/macro.h
@@ -6,17 +6,6 @@
 #define ENTT_STR(arg) #arg
 #define ENTT_XSTR(arg) ENTT_STR(arg)
 
-#define ENTT_CONSTEVAL constexpr
-
-#if __has_include(<version>)
-#    include <version>
-#
-#    if defined(__cpp_consteval)
-#        undef ENTT_CONSTEVAL
-#        define ENTT_CONSTEVAL consteval
-#    endif
-#endif
-
 // NOLINTEND(cppcoreguidelines-macro-usage)
 
 #endif