From 388a2e6ded4ccea14c2aaa8a0ed420882de3a240 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 14 Jul 2019 19:04:52 -0400 Subject: [PATCH] Fix macro paste in CRYPTOPP_ASSERT_JOIN --- misc.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/misc.h b/misc.h index 1e80bea4..49a498aa 100644 --- a/misc.h +++ b/misc.h @@ -158,8 +158,6 @@ struct CompileAssert #define CRYPTOPP_COMPILE_ASSERT(assertion) \ CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, (__LINE__-1)) -#define CRYPTOPP_ASSERT_JOIN(X, Y) CRYPTOPP_DO_ASSERT_JOIN(X, Y) -#define CRYPTOPP_DO_ASSERT_JOIN(X, Y) X##Y #if defined(CRYPTOPP_EXPORTS) || defined(CRYPTOPP_IMPORTS) # define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) @@ -175,6 +173,9 @@ struct CompileAssert # endif // GCC or Clang #endif +#define CRYPTOPP_ASSERT_JOIN(X, Y) CRYPTOPP_DO_ASSERT_JOIN(X, Y) +#define CRYPTOPP_DO_ASSERT_JOIN(X, Y) X##Y + #endif // CRYPTOPP_DOXYGEN_PROCESSING // ************** count elements in an array ***************