Added COUNTOF to misc.h to count elements in an array (fails on pointers). Moved CRYPTOPP_UNUSED to misc.h
parent
63dd0f5f54
commit
f2379159f8
2
config.h
2
config.h
|
|
@ -94,8 +94,6 @@
|
|||
|
||||
typedef unsigned char byte; // put in global namespace to avoid ambiguity with other byte typedefs
|
||||
|
||||
#define CRYPTOPP_UNUSED(x) ((void)x) // cast to void. Portable way to suppress unused variable
|
||||
|
||||
NAMESPACE_BEGIN(CryptoPP)
|
||||
|
||||
typedef unsigned short word16;
|
||||
|
|
|
|||
12
misc.h
12
misc.h
|
|
@ -66,6 +66,18 @@ struct CompileAssert
|
|||
#define CRYPTOPP_ASSERT_JOIN(X, Y) CRYPTOPP_DO_ASSERT_JOIN(X, Y)
|
||||
#define CRYPTOPP_DO_ASSERT_JOIN(X, Y) X##Y
|
||||
|
||||
// ************** unused variable suppression ***************
|
||||
// Cast to void. Portable way to suppress warning
|
||||
#define CRYPTOPP_UNUSED(x) ((void)x)
|
||||
|
||||
// ************** counting elements in an array ***************
|
||||
// VS2005 added _countof macro, fails on pointers
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
|
||||
# define COUNTOF(x) _countof(x)
|
||||
#else
|
||||
# define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
|
||||
#endif
|
||||
|
||||
// ************** misc classes ***************
|
||||
|
||||
class CRYPTOPP_DLL Empty
|
||||
|
|
|
|||
Loading…
Reference in New Issue