From 769643bbe17b48e7072b974391544c707b1f71fb Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 14 Jul 2019 19:09:05 -0400 Subject: [PATCH] Fix macro paste in CRYPTOPP_ASSERT_JOIN --- misc.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/misc.h b/misc.h index 49a498aa..05ff6d73 100644 --- a/misc.h +++ b/misc.h @@ -156,8 +156,9 @@ struct CompileAssert static char dummy[2*b-1]; }; -#define CRYPTOPP_COMPILE_ASSERT(assertion) \ - CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, (__LINE__-1)) +#define CRYPTOPP_COMPILE_ASSERT(assertion) CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, __LINE__) +#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) @@ -173,9 +174,6 @@ 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 ***************