From 7fcc3c4ff04745aa7095ead157c8161a248f479e Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 30 Apr 2019 12:32:44 -0400 Subject: [PATCH] Try fix MSVC 2013 compile --- blake2.cpp | 12 ++++++------ donna_32.cpp | 6 +++--- donna_64.cpp | 6 +++--- salsa.cpp | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/blake2.cpp b/blake2.cpp index 622603c3..cee977e9 100644 --- a/blake2.cpp +++ b/blake2.cpp @@ -44,15 +44,15 @@ #endif #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) -const unsigned int ALIGN_SPEC32=16; -const unsigned int ALIGN_SPEC64=16; +static const unsigned int ALIGN_SPEC32=16; +static const unsigned int ALIGN_SPEC64=16; #elif (CRYPTOPP_CXX11_ALIGNOF) -const unsigned int ALIGN_SPEC32=alignof(CryptoPP::word32); -const unsigned int ALIGN_SPEC64=alignof(CryptoPP::word64); +static const unsigned int ALIGN_SPEC32=alignof(CryptoPP::word32); +static const unsigned int ALIGN_SPEC64=alignof(CryptoPP::word64); #else // Can't use GetAlignmentOf() because of C++11 constexpr -const unsigned int ALIGN_SPEC32=4; -const unsigned int ALIGN_SPEC64=8; +static const unsigned int ALIGN_SPEC32=4; +static const unsigned int ALIGN_SPEC64=8; #endif NAMESPACE_BEGIN(CryptoPP) diff --git a/donna_32.cpp b/donna_32.cpp index 2fc72e9a..e4c91b31 100644 --- a/donna_32.cpp +++ b/donna_32.cpp @@ -40,12 +40,12 @@ extern const char DONNA32_FNAME[] = __FILE__; ANONYMOUS_NAMESPACE_BEGIN #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) -const unsigned int ALIGN_SPEC=16; +static const unsigned int ALIGN_SPEC=16; #elif (CRYPTOPP_CXX11_ALIGNOF) -const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32); +static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32); #else // Can't use GetAlignmentOf() because of C++11 constexpr -const unsigned int ALIGN_SPEC=4; +static const unsigned int ALIGN_SPEC=4; #endif ANONYMOUS_NAMESPACE_END diff --git a/donna_64.cpp b/donna_64.cpp index 77ffe9c3..021bc03a 100644 --- a/donna_64.cpp +++ b/donna_64.cpp @@ -40,12 +40,12 @@ extern const char DONNA64_FNAME[] = __FILE__; ANONYMOUS_NAMESPACE_BEGIN #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) -const unsigned int ALIGN_SPEC=16; +static const unsigned int ALIGN_SPEC=16; #elif (CRYPTOPP_CXX11_ALIGNOF) -const unsigned int ALIGN_SPEC=alignof(CryptoPP::word64); +static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word64); #else // Can't use GetAlignmentOf() because of C++11 constexpr -const unsigned int ALIGN_SPEC=8; +static const unsigned int ALIGN_SPEC=8; #endif ANONYMOUS_NAMESPACE_END diff --git a/salsa.cpp b/salsa.cpp index 01c57d22..608bb385 100644 --- a/salsa.cpp +++ b/salsa.cpp @@ -29,12 +29,12 @@ ANONYMOUS_NAMESPACE_BEGIN #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) -const unsigned int ALIGN_SPEC=16; +static const unsigned int ALIGN_SPEC=16; #elif (CRYPTOPP_CXX11_ALIGNOF) -const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32); +static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32); #else // Can't use GetAlignmentOf() because of C++11 constexpr -const unsigned int ALIGN_SPEC=4; +static const unsigned int ALIGN_SPEC=4; #endif ANONYMOUS_NAMESPACE_END