Add EnumToInt conversion macro for enum-enum conversion warnings (GH #1016)

1 files changed, 11 insertions, 0 deletions

diff --git a/misc.h b/misc.h
index 5f9e6eed..b2272ae9 100644
--- a/misc.h
+++ b/misc.h
@@ -473,6 +473,7 @@ const byte* ConstBytePtr(const SecByteBlock& str);
 /// \brief Size of a string

 /// \param str std::string

 /// \return size of a string

+/// \since Crypto++ 8.3

 inline size_t BytePtrSize(const std::string& str)

 {

 	return str.size();

@@ -481,8 +482,18 @@ inline size_t BytePtrSize(const std::string& str)
 /// \brief Size of a string

 /// \param str SecByteBlock

 /// \return size of a string

+/// \since Crypto++ 8.3

 size_t BytePtrSize(const SecByteBlock& str);

 

+/// \brief Integer value

+/// \details EnumToInt is a convenience macro to convert enums

+///  to integers. The cast avoids C++20 enum-enum conversion

+///  warnings.

+/// \details A macro is used due to [lack of] constexpr-ness in

+///  early versions of C++.

+/// \since Crypto++ 8.6

+#define EnumToInt(v) static_cast<int>(v)

+

 #if (!__STDC_WANT_SECURE_LIB__ && !defined(_MEMORY_S_DEFINED)) || defined(CRYPTOPP_WANT_SECURE_LIB)

 

 /// \brief Bounds checking replacement for memcpy()