Add CRYPTOPP_STATIC_CONSTEXPR macro

1 files changed, 5 insertions, 5 deletions

diff --git a/sha.h b/sha.h
index f22d0cff..008c9b37 100644
--- a/sha.h
+++ b/sha.h
@@ -27,7 +27,7 @@ class CRYPTOPP_DLL SHA1 : public IteratedHashWithStaticTransform<word32, BigEndi
 public:

 	static void CRYPTOPP_API InitState(HashWordType *state);

 	static void CRYPTOPP_API Transform(word32 *digest, const word32 *data);

-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-1";}

+	CRYPTOPP_STATIC_CONSTEXPR char* const CRYPTOPP_API StaticAlgorithmName() {return "SHA-1";}

 };

 

 typedef SHA1 SHA;	// for backwards compatibility

@@ -44,7 +44,7 @@ public:
 #endif

 	static void CRYPTOPP_API InitState(HashWordType *state);

 	static void CRYPTOPP_API Transform(word32 *digest, const word32 *data);

-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-256";}

+	CRYPTOPP_STATIC_CONSTEXPR char* const CRYPTOPP_API StaticAlgorithmName() {return "SHA-256";}

 };

 

 //! \class SHA224

@@ -59,7 +59,7 @@ public:
 #endif

 	static void CRYPTOPP_API InitState(HashWordType *state);

 	static void CRYPTOPP_API Transform(word32 *digest, const word32 *data) {SHA256::Transform(digest, data);}

-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-224";}

+	CRYPTOPP_STATIC_CONSTEXPR char* const CRYPTOPP_API StaticAlgorithmName() {return "SHA-224";}

 };

 

 //! \class SHA512

@@ -71,7 +71,7 @@ class CRYPTOPP_DLL SHA512 : public IteratedHashWithStaticTransform<word64, BigEn
 public:

 	static void CRYPTOPP_API InitState(HashWordType *state);

 	static void CRYPTOPP_API Transform(word64 *digest, const word64 *data);

-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-512";}

+	CRYPTOPP_STATIC_CONSTEXPR char* const CRYPTOPP_API StaticAlgorithmName() {return "SHA-512";}

 };

 

 //! \class SHA384

@@ -83,7 +83,7 @@ class CRYPTOPP_DLL SHA384 : public IteratedHashWithStaticTransform<word64, BigEn
 public:

 	static void CRYPTOPP_API InitState(HashWordType *state);

 	static void CRYPTOPP_API Transform(word64 *digest, const word64 *data) {SHA512::Transform(digest, data);}

-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-384";}

+	CRYPTOPP_STATIC_CONSTEXPR char* const CRYPTOPP_API StaticAlgorithmName() {return "SHA-384";}

 };

 

 NAMESPACE_END