From f1386ad894707dde41405fc2a9dbdbc7e4550d04 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Mon, 13 Nov 2017 13:08:56 -0500
Subject: [PATCH] Fix SunCC 12.5 compile with -std=c++11

---
 blake2-simd.cpp | 2 +-
 blake2.cpp      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/blake2-simd.cpp b/blake2-simd.cpp
index 09650038..a3f05c76 100644
--- a/blake2-simd.cpp
+++ b/blake2-simd.cpp
@@ -50,7 +50,7 @@ NAMESPACE_BEGIN(CryptoPP)
 inline __m128i MM_SET_EPI64X(const word64 a, const word64 b)
 {
     const word64 t[2] = {b,a}; __m128i r;
-    ::memcpy(&r, &t, sizeof(t));
+    ::memcpy(&r, t, sizeof(t));
     return r;
 }
 #else
diff --git a/blake2.cpp b/blake2.cpp
index fe237fba..c4be4621 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -46,15 +46,13 @@ struct BLAKE2_IV
     static const W iv[8];
 };
 
-template<>
-CRYPTOPP_ALIGN_DATA(16)
+template <>
 const word32 BLAKE2_IV<word32, false>::iv[8] = {
     0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
     0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL
 };
 
-template<>
-CRYPTOPP_ALIGN_DATA(16)
+template <>
 const word64 BLAKE2_IV<word64, true>::iv[8] = {
     W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b),
     W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1),