arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
pull/838/head
Jeffrey Walton 2019-04-30 23:00:56 -04:00 committed by GitHub
parent ff544c386c
commit 7ef3dacdc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blake2.cpp
View File

@ -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

4
donna_32.cpp
View File

@ -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

4
donna_64.cpp
View File

@ -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

4
salsa.cpp
View File

@ -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