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

Try fix MSVC 2013 compile

pull/828/head
Jeffrey Walton 2019-04-30 12:32:44 -04:00
parent b9fe3a3415
commit 7fcc3c4ff0
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
blake2.cpp
View File

@ -44,15 +44,15 @@
#endif #endif
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
const unsigned int ALIGN_SPEC32=16; static const unsigned int ALIGN_SPEC32=16;
const unsigned int ALIGN_SPEC64=16; static const unsigned int ALIGN_SPEC64=16;
#elif (CRYPTOPP_CXX11_ALIGNOF) #elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC32=alignof(CryptoPP::word32); static const unsigned int ALIGN_SPEC32=alignof(CryptoPP::word32);
const unsigned int ALIGN_SPEC64=alignof(CryptoPP::word64); static const unsigned int ALIGN_SPEC64=alignof(CryptoPP::word64);
#else #else
// Can't use GetAlignmentOf<word64>() because of C++11 constexpr // Can't use GetAlignmentOf<word64>() because of C++11 constexpr
const unsigned int ALIGN_SPEC32=4; static const unsigned int ALIGN_SPEC32=4;
const unsigned int ALIGN_SPEC64=8; static const unsigned int ALIGN_SPEC64=8;
#endif #endif
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)

6
donna_32.cpp
View File

@ -40,12 +40,12 @@ extern const char DONNA32_FNAME[] = __FILE__;
ANONYMOUS_NAMESPACE_BEGIN ANONYMOUS_NAMESPACE_BEGIN
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #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) #elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32); static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32);
#else #else
// Can't use GetAlignmentOf<word32>() because of C++11 constexpr // Can't use GetAlignmentOf<word32>() because of C++11 constexpr
const unsigned int ALIGN_SPEC=4; static const unsigned int ALIGN_SPEC=4;
#endif #endif
ANONYMOUS_NAMESPACE_END ANONYMOUS_NAMESPACE_END

6
donna_64.cpp
View File

@ -40,12 +40,12 @@ extern const char DONNA64_FNAME[] = __FILE__;
ANONYMOUS_NAMESPACE_BEGIN ANONYMOUS_NAMESPACE_BEGIN
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #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) #elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC=alignof(CryptoPP::word64); static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word64);
#else #else
// Can't use GetAlignmentOf<word64>() because of C++11 constexpr // Can't use GetAlignmentOf<word64>() because of C++11 constexpr
const unsigned int ALIGN_SPEC=8; static const unsigned int ALIGN_SPEC=8;
#endif #endif
ANONYMOUS_NAMESPACE_END ANONYMOUS_NAMESPACE_END

6
salsa.cpp
View File

@ -29,12 +29,12 @@
ANONYMOUS_NAMESPACE_BEGIN ANONYMOUS_NAMESPACE_BEGIN
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #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) #elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32); static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32);
#else #else
// Can't use GetAlignmentOf<word32>() because of C++11 constexpr // Can't use GetAlignmentOf<word32>() because of C++11 constexpr
const unsigned int ALIGN_SPEC=4; static const unsigned int ALIGN_SPEC=4;
#endif #endif
ANONYMOUS_NAMESPACE_END ANONYMOUS_NAMESPACE_END