Added COUNTOF to misc.h to count elements in an array (fails on pointers). Moved CRYPTOPP_UNUSED to misc.h

1 files changed, 12 insertions, 0 deletions

diff --git a/misc.h b/misc.h
index 5b778c7c..303c29c6 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