Whitespace check-in

pull/757/head
Jeffrey Walton 2018-12-04 03:56:47 -05:00
parent fc5019a89e
commit 71ce30f75f
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 28 additions and 30 deletions

View File

@ -1,4 +1,4 @@
#include <cstdint> #include <stdint.h>
#include <immintrin.h> #include <immintrin.h>
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

View File

@ -995,7 +995,6 @@ public:
}; };
#if HAVE_GCC_INIT_PRIORITY #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 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 AAD_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 26))) = "AAD";
const NullNameValuePairs s_nullNameValuePairs __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 27))); const NullNameValuePairs s_nullNameValuePairs __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 27)));
@ -1015,9 +1014,8 @@ const std::string AAD_CHANNEL = "AAD";
const NullNameValuePairs s_nullNameValuePairs; const NullNameValuePairs s_nullNameValuePairs;
const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs; const NameValuePairs& g_nullNameValuePairs = s_nullNameValuePairs;
#else #else
static const std::string s1(""), s2("AAD"); const std::string DEFAULT_CHANNEL = "";
const std::string DEFAULT_CHANNEL = s1; const std::string AAD_CHANNEL = "AAD";
const std::string AAD_CHANNEL = s2;
const simple_ptr<NullNameValuePairs> s_pNullNameValuePairs(new NullNameValuePairs); const simple_ptr<NullNameValuePairs> s_pNullNameValuePairs(new NullNameValuePairs);
const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p; const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p;
#endif #endif