Function like macros to avoid typos

gracicot · Dec 19, 2023 · ce49627 · ce49627
1 parent a8d5f49
commit ce49627
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 29 deletions.
diff --git a/include/kangaru/detail/deducer.hpp b/include/kangaru/detail/deducer.hpp
@@ -73,12 +73,12 @@ namespace kangaru {
 		template<deducible T>
 		operator T& () const;
 
-		#if KANGARU5_LVALUE_CONST_AMBIGUOUS == 1
+		#if KANGARU5_LVALUE_CONST_AMBIGUOUS() == 1
 		template<deducible T>
 		operator T const& () const;
 		#endif
 
-		#if KANGARU5_RVALUE_AMBIGUOUS == 1
+		#if KANGARU5_RVALUE_AMBIGUOUS() == 1
 		template<typename T>
 		operator T&& () const;
 		#endif
@@ -93,12 +93,12 @@ namespace kangaru {
 		template<deducible T>
 		operator T& ();
 
-		#if KANGARU5_LVALUE_CONST_AMBIGUOUS == 1
+		#if KANGARU5_LVALUE_CONST_AMBIGUOUS() == 1
 		template<deducible T>
 		operator T const& ();
 		#endif
 
-		#if KANGARU5_RVALUE_AMBIGUOUS == 1
+		#if KANGARU5_RVALUE_AMBIGUOUS() == 1
 		template<typename T>
 		operator T&& ();
 		#endif

diff --git a/include/kangaru/detail/define.hpp b/include/kangaru/detail/define.hpp
@@ -2,30 +2,30 @@
 #define KANGARU5_DETAIL_DEFINE_HPP
 
 #if defined(_MSC_VER) && !defined(__clang__)
-#define KANGARU5_IS_MSVC 1
+#define KANGARU5_IS_MSVC() 1
 #else
-#define KANGARU5_IS_MSVC 0
+#define KANGARU5_IS_MSVC() 0
 #endif
 
 #if defined(__GNUC__) && !defined(__clang__)
-#define KANGARU5_IS_GNU 1
+#define KANGARU5_IS_GNU() 1
 #else
-#define KANGARU5_IS_GNU 0
+#define KANGARU5_IS_GNU() 0
 #endif
 
 #if defined(__clang__)
-#define KANGARU5_IS_CLANG 1
+#define KANGARU5_IS_CLANG() 1
 #else
-#define KANGARU5_IS_CLANG 0
+#define KANGARU5_IS_CLANG() 0
 #endif
 
-#if KANGARU5_IS_MSVC == 1
+#if KANGARU5_IS_MSVC() == 1
 #define KANGARU5_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
 #else
 #define KANGARU5_NO_UNIQUE_ADDRESS [[no_unique_address]]
 #endif
 
-#if KANGARU_IS_MSVC == 1
+#if KANGARU5_IS_MSVC() == 1
 #define KANGARU5_FUNCTION_SIGNATURE __FUNCSIG__
 #else
 #define KANGARU5_FUNCTION_SIGNATURE __PRETTY_FUNCTION__
@@ -34,30 +34,22 @@
 #define KANGARU5_FWD(...) static_cast<decltype(__VA_ARGS__)&&>(__VA_ARGS__)
 #define KANGARU5_CONSTRUCTOR_T(...) decltype(::kangaru::constructor<__VA_ARGS__>())
 
-#if KANGARU5_IS_CLANG == 1
+#if KANGARU5_IS_CLANG() == 1
 #define KANGARU5_INLINE [[gnu::always_inline]]
-#define KANGARU5_RVALUE_AMBIGUOUS 0
-#define KANGARU5_LVALUE_CONST_AMBIGUOUS 1
+#define KANGARU5_RVALUE_AMBIGUOUS() 0
+#define KANGARU5_LVALUE_CONST_AMBIGUOUS() 1
 #endif
 
-#if KANGARU5_IS_GNU == 1
+#if KANGARU5_IS_GNU() == 1
 #define KANGARU5_INLINE [[gnu::always_inline]]
-#define KANGARU5_RVALUE_AMBIGUOUS 1
-#define KANGARU5_LVALUE_CONST_AMBIGUOUS 0
+#define KANGARU5_RVALUE_AMBIGUOUS() 1
+#define KANGARU5_LVALUE_CONST_AMBIGUOUS() 0
 #endif
 
-#if KANGARU5_IS_MSVC == 1
+#if KANGARU5_IS_MSVC() == 1
 #define KANGARU5_INLINE [[msvc::forceinline]]
-#define KANGARU5_RVALUE_AMBIGUOUS 0
-#define KANGARU5_LVALUE_CONST_AMBIGUOUS 1
-#endif
-
-// #define KANGARU5_DEBUG_SKIP_PRVALUE_PREPASS
-
-#ifdef KANGARU5_DEBUG_SKIP_PRVALUE_PREPASS
-#define KANGARU5_SKIP_PRVALUE_PREPASS 1
-#else
-#define KANGARU5_SKIP_PRVALUE_PREPASS 0
+#define KANGARU5_RVALUE_AMBIGUOUS() 0
+#define KANGARU5_LVALUE_CONST_AMBIGUOUS() 1
 #endif
 
 #undef KANGARU5_IS_MSVC