Fix ABI namespace on MSVC

isce-framework · Aug 3, 2024 · a1560e7 · a1560e7
1 parent 96b1670
commit a1560e7
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/include/whirlwind/common/namespace.hpp b/include/whirlwind/common/namespace.hpp
@@ -2,21 +2,16 @@
 
 #include "version.hpp"
 
-/**
- * @def WHIRLWIND_CONCATENATE(...)
- *
- * Concatenate zero or more (up to eight) tokens. Macros are expanded.
- */
-#define WHIRLWIND_CONCATENATE_(a, b, c, d, e, f, g, h, ...) a##b##c##d##e##f##g##h
-#define WHIRLWIND_CONCATENATE(...) WHIRLWIND_CONCATENATE_(__VA_ARGS__, , , , , , , , )
-
 /**
  * @def WHIRLWIND_ABI_NAMESPACE
  *
  * The name of the inline ABI namespace.
  */
+#define WHIRLWIND_MAKE_ABI_NAMESPACE_IMPL(epoch, patch) abi_##epoch##_##patch
+#define WHIRLWIND_MAKE_ABI_NAMESPACE(epoch, patch)                                     \
+    WHIRLWIND_MAKE_ABI_NAMESPACE_IMPL(epoch, patch)
 #define WHIRLWIND_ABI_NAMESPACE                                                        \
-    WHIRLWIND_CONCATENATE(abi_, WHIRLWIND_VERSION_EPOCH, _, WHIRLWIND_VERSION_PATCH)
+    WHIRLWIND_MAKE_ABI_NAMESPACE(WHIRLWIND_VERSION_EPOCH, WHIRLWIND_VERSION_PATCH)
 
 /**
  * @def WHIRLWIND_NAMESPACE