Fix macro paste in CRYPTOPP_ASSERT_JOIN

1 files 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 ***************