Fix deprecated warning with message under GCC 4.47

1 files changed, 4 insertions, 28 deletions

diff --git a/default.h b/default.h
index 6b30f2e4..8b35ad7f 100644
--- a/default.h
+++ b/default.h
@@ -48,13 +48,7 @@ private:
 	SecByteBlock m_passphrase;

 	CBC_Mode<DefaultBlockCipher>::Encryption m_cipher;

 

-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)

-} __attribute__((deprecated ("DefaultEncryptor will be changing in the near future because the algorithms are no longer secure")));

-#elif (CRYPTOPP_GCC_VERSION)

-} __attribute__((deprecated));

-#else

-};

-#endif

+} CRYPTOPP_DEPRECATED ("DefaultEncryptor will be changing in the near future because the algorithms are no longer secure");

 

 //! \class DefaultDecryptor

 //! \brief Password-Based Decryptor using TripleDES

@@ -101,13 +95,7 @@ private:
 	member_ptr<FilterWithBufferedInput> m_decryptor;

 	bool m_throwException;

 

-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)

-} __attribute__((deprecated ("DefaultDecryptor will be changing in the near future because the algorithms are no longer secure")));

-#elif (CRYPTOPP_GCC_VERSION)

-} __attribute__((deprecated));

-#else

-};

-#endif

+} CRYPTOPP_DEPRECATED ("DefaultDecryptor will be changing in the near future because the algorithms are no longer secure");

 

 //! \class DefaultEncryptorWithMAC

 //! \brief Password-Based encryptor using TripleDES and HMAC/SHA-1

@@ -139,13 +127,7 @@ protected:
 private:

 	member_ptr<DefaultMAC> m_mac;

 

-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)

-} __attribute__((deprecated ("DefaultEncryptorWithMAC will be changing in the near future because the algorithms are no longer secure")));

-#elif (CRYPTOPP_GCC_VERSION)

-} __attribute__((deprecated));

-#else

-};

-#endif

+} CRYPTOPP_DEPRECATED ("DefaultEncryptorWithMAC will be changing in the near future because the algorithms are no longer secure");

 

 //! \class DefaultDecryptorWithMAC

 //! \brief Password-Based decryptor using TripleDES and HMAC/SHA-1

@@ -188,13 +170,7 @@ private:
 	HashVerifier *m_hashVerifier;

 	bool m_throwException;

 

-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)

-} __attribute__((deprecated ("DefaultDecryptorWithMAC will be changing in the near future because the algorithms are no longer secure")));

-#elif (CRYPTOPP_GCC_VERSION)

-} __attribute__((deprecated));

-#else

-};

-#endif

+} CRYPTOPP_DEPRECATED ("DefaultDecryptorWithMAC will be changing in the near future because the algorithms are no longer secure");

 

 NAMESPACE_END