From 7ef3dacdc2cdd9d87e6ac74943b2b895cc8739c0 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Tue, 30 Apr 2019 23:00:56 -0400
Subject: [PATCH] Remove C++11 constexpr code for CRYPTOPP_ALIGN_DATA (PR #830)

I don't have faith in it even though it has tested good so far.
---
 blake2.cpp   | 5 +----
 donna_32.cpp | 4 +---
 donna_64.cpp | 4 +---
 salsa.cpp    | 4 +---
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/blake2.cpp b/blake2.cpp
index 4623d23b..71c3a432 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -44,13 +44,10 @@
 #endif
 
 // Can't use GetAlignmentOf<word64>() because of C++11 and constexpr
-// Can use 'const unsigned int' because of MSVC
+// Can use 'const unsigned int' because of MSVC 2013
 #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
 # define ALIGN_SPEC32 16
 # define ALIGN_SPEC64 16
-#elif (CRYPTOPP_CXX11_ALIGNOF)
-# define ALIGN_SPEC32 alignof(CryptoPP::word32)
-# define ALIGN_SPEC64 alignof(CryptoPP::word64)
 #else
 # define ALIGN_SPEC32 4
 # define ALIGN_SPEC64 8
diff --git a/donna_32.cpp b/donna_32.cpp
index 2e07834a..cfbc6575 100644
--- a/donna_32.cpp
+++ b/donna_32.cpp
@@ -40,11 +40,9 @@ extern const char DONNA32_FNAME[] = __FILE__;
 ANONYMOUS_NAMESPACE_BEGIN
 
 // Can't use GetAlignmentOf<word32>() because of C++11 and constexpr
-// Can use 'const unsigned int' because of MSVC
+// Can use 'const unsigned int' because of MSVC 2013
 #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
 # define ALIGN_SPEC 16
-#elif (CRYPTOPP_CXX11_ALIGNOF)
-# define ALIGN_SPEC alignof(CryptoPP::word32)
 #else
 # define ALIGN_SPEC 4
 #endif
diff --git a/donna_64.cpp b/donna_64.cpp
index 1a67ed38..82b82fd4 100644
--- a/donna_64.cpp
+++ b/donna_64.cpp
@@ -40,11 +40,9 @@ extern const char DONNA64_FNAME[] = __FILE__;
 ANONYMOUS_NAMESPACE_BEGIN
 
 // Can't use GetAlignmentOf<word64>() because of C++11 and constexpr
-// Can use 'const unsigned int' because of MSVC
+// Can use 'const unsigned int' because of MSVC 2013
 #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
 # define ALIGN_SPEC 16
-#elif (CRYPTOPP_CXX11_ALIGNOF)
-# define ALIGN_SPEC alignof(CryptoPP::word64)
 #else
 # define ALIGN_SPEC 8
 #endif
diff --git a/salsa.cpp b/salsa.cpp
index 751cd04a..987cd302 100644
--- a/salsa.cpp
+++ b/salsa.cpp
@@ -29,11 +29,9 @@
 ANONYMOUS_NAMESPACE_BEGIN
 
 // Can't use GetAlignmentOf<word32>() because of C++11 and constexpr
-// Can use 'const unsigned int' because of MSVC
+// Can use 'const unsigned int' because of MSVC 2013
 #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
 # define ALIGN_SPEC 16
-#elif (CRYPTOPP_CXX11_ALIGNOF)
-# define ALIGN_SPEC alignof(CryptoPP::word32)
 #else
 # define ALIGN_SPEC 4
 #endif