arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix macro paste in CRYPTOPP_ASSERT_JOIN

pull/867/head
Jeffrey Walton 2019-07-14 19:09:05 -04:00
parent 388a2e6ded
commit 769643bbe1
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misc.h
View File

@ -156,8 +156,9 @@ struct CompileAssert
static char dummy[2*b-1]; static char dummy[2*b-1];
}; };
#define CRYPTOPP_COMPILE_ASSERT(assertion) \ #define CRYPTOPP_COMPILE_ASSERT(assertion) CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, __LINE__)
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) #if defined(CRYPTOPP_EXPORTS) || defined(CRYPTOPP_IMPORTS)
# define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) # define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance)
@ -173,9 +174,6 @@ struct CompileAssert
# endif // GCC or Clang # endif // GCC or Clang
#endif #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 #endif // CRYPTOPP_DOXYGEN_PROCESSING
// ************** count elements in an array *************** // ************** count elements in an array ***************