diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-12-04 03:56:47 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-12-04 03:56:47 -0500 |
| commit | 71ce30f75f81e18c23bcdd95e444f86f25464764 (patch) | |
| tree | 786bee48ac6477641ae1cebd9063d397173bb16d /cryptlib.cpp | |
| parent | fc5019a89e9935b9329e041d1a55dac0b323dac4 (diff) | |
| download | cryptopp-git-71ce30f75f81e18c23bcdd95e444f86f25464764.tar.gz | |
Whitespace check-in
Diffstat (limited to 'cryptlib.cpp')
| -rw-r--r-- | cryptlib.cpp | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/cryptlib.cpp b/cryptlib.cpp index 6399ec53..c4463b0c 100644 --- a/cryptlib.cpp +++ b/cryptlib.cpp @@ -995,31 +995,29 @@ public: };
#if HAVE_GCC_INIT_PRIORITY
-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 NullNameValuePairs s_nullNameValuePairs __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 27)));
-const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs;
+ 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 NullNameValuePairs s_nullNameValuePairs __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 27)));
+ const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs;
#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 NullNameValuePairs s_nullNameValuePairs;
-const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs;
-#pragma warning(default: 4073)
+ #pragma warning(disable: 4073)
+ #pragma init_seg(lib)
+ const std::string DEFAULT_CHANNEL = "";
+ const std::string AAD_CHANNEL = "AAD";
+ const NullNameValuePairs s_nullNameValuePairs;
+ const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs;
+ #pragma warning(default: 4073)
#elif HAVE_XLC_INIT_PRIORITY
-#pragma priority(260)
-const std::string DEFAULT_CHANNEL = "";
-const std::string AAD_CHANNEL = "AAD";
-const NullNameValuePairs s_nullNameValuePairs;
-const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs;
+ #pragma priority(260)
+ const std::string DEFAULT_CHANNEL = "";
+ const std::string AAD_CHANNEL = "AAD";
+ const NullNameValuePairs s_nullNameValuePairs;
+ const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs;
#else
-static const std::string s1(""), s2("AAD");
-const std::string DEFAULT_CHANNEL = s1;
-const std::string AAD_CHANNEL = s2;
-const simple_ptr<NullNameValuePairs> s_pNullNameValuePairs(new NullNameValuePairs);
-const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p;
+ const std::string DEFAULT_CHANNEL = "";
+ const std::string AAD_CHANNEL = "AAD";
+ const simple_ptr<NullNameValuePairs> s_pNullNameValuePairs(new NullNameValuePairs);
+ const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p;
#endif
NAMESPACE_END // CryptoPP
|