Add C++11 alignas support. Deleting 'alignas' branch

1 files changed, 4 insertions, 0 deletions

diff --git a/blake2.cpp b/blake2.cpp
index 0d110c0d..d580647a 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -69,6 +69,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2_IV<false>
 	CRYPTOPP_ALIGN_DATA(16) static const word32 iv[8];

 };

 

+CRYPTOPP_ALIGN_DATA(16)

 const word32 BLAKE2_IV<false>::iv[8] = {

 	0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,

 	0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL

@@ -84,6 +85,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2_IV<true>
 	CRYPTOPP_ALIGN_DATA(16) static const word64 iv[8];

 };

 

+CRYPTOPP_ALIGN_DATA(16)

 const word64 BLAKE2_IV<true>::iv[8] = {

 	W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b),

 	W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1),

@@ -105,6 +107,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma<false>
 	CRYPTOPP_ALIGN_DATA(16) static const byte sigma[10][16];

 };

 

+CRYPTOPP_ALIGN_DATA(16)

 const byte BLAKE2_Sigma<false>::sigma[10][16] = {

 	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },

 	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },

@@ -126,6 +129,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma<true>
 	CRYPTOPP_ALIGN_DATA(16) static const byte sigma[12][16];

 };

 

+CRYPTOPP_ALIGN_DATA(16)

 const byte BLAKE2_Sigma<true>::sigma[12][16] = {

 	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },

 	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },