Fix macro paste in CRYPTOPP_ASSERT_JOIN

pull/867/head
Jeffrey Walton 2019-07-14 19:04:52 -04:00
parent f5881d121a
commit 388a2e6ded
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 3 additions and 2 deletions

5
misc.h
View File

@ -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 ***************