From 95472b9b3efe233a17e370566011780bbffa9d31 Mon Sep 17 00:00:00 2001 From: noloader Date: Fri, 3 Jul 2015 19:32:41 +0000 Subject: Added COUNTOF to misc.h to count elements in an array (fails on pointers). Moved CRYPTOPP_UNUSED to misc.h git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@569 57ff6487-cd31-0410-9ec3-f628ee90f5f0 --- misc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'misc.h') diff --git a/misc.h b/misc.h index 5b778c7..303c29c 100644 --- a/misc.h +++ b/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 -- cgit v1.2.1