From 71ce30f75f81e18c23bcdd95e444f86f25464764 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Tue, 4 Dec 2018 03:56:47 -0500
Subject: [PATCH] Whitespace check-in

---
 TestPrograms/test_x86_avx512.cxx | 16 ++++++------
 cryptlib.cpp                     | 42 +++++++++++++++-----------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/TestPrograms/test_x86_avx512.cxx b/TestPrograms/test_x86_avx512.cxx
index 78b4d87a..686e2395 100644
--- a/TestPrograms/test_x86_avx512.cxx
+++ b/TestPrograms/test_x86_avx512.cxx
@@ -1,8 +1,8 @@
-#include <cstdint>
-#include <immintrin.h>
-int main(int argc, char* argv[])
-{
-    uint64_t x[8] = {0};
-    __m512i y = _mm512_loadu_si512((__m512i*)x);
-    return 0;
-}
+#include <stdint.h>
+#include <immintrin.h>
+int main(int argc, char* argv[])
+{
+    uint64_t x[8] = {0};
+    __m512i y = _mm512_loadu_si512((__m512i*)x);
+    return 0;
+}
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