From 5fb2f5d45b9bb2cd86db5d01f4b30d606a2a4c80 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 1 Mar 2017 03:54:02 -0500 Subject: Remove NULL_CHANNEL and CW8 workaround (Issue 382) --- cryptlib.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'cryptlib.cpp') diff --git a/cryptlib.cpp b/cryptlib.cpp index da639eed..dc6e2b33 100644 --- a/cryptlib.cpp +++ b/cryptlib.cpp @@ -46,19 +46,16 @@ CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word)); CRYPTOPP_COMPILE_ASSERT(CRYPTOPP_INIT_PRIORITY >= 101); const std::string DEFAULT_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 25))) = ""; const std::string AAD_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 26))) = "AAD"; -const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL; #elif HAVE_MSC_INIT_PRIORITY #pragma warning(disable: 4073) #pragma init_seg(lib) const std::string DEFAULT_CHANNEL = ""; const std::string AAD_CHANNEL = "AAD"; -const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL; #pragma warning(default: 4073) #else static const std::string s1(""), s2("AAD"); const std::string DEFAULT_CHANNEL = s1; const std::string AAD_CHANNEL = s2; -const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL; #endif class NullNameValuePairs : public NameValuePairs -- cgit v1.2.1