summaryrefslogtreecommitdiff
path: root/blake2.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2016-12-03 05:05:56 -0500
committerJeffrey Walton <noloader@gmail.com>2016-12-03 05:05:56 -0500
commitba75834ae9b3846a19291c8c281626dd0a891779 (patch)
tree85c0492501a0f44c640120e9cacc740354824a47 /blake2.cpp
parentbded4d385fcb74c517e35bf252ac8c6d60a0599f (diff)
downloadcryptopp-git-ba75834ae9b3846a19291c8c281626dd0a891779.tar.gz
Removed VC++ 5.0 and 6.0 workarounds (Issue 342)
Diffstat (limited to 'blake2.cpp')
-rw-r--r--blake2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/blake2.cpp b/blake2.cpp
index 931a35b1..508b59db 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -25,7 +25,7 @@ NAMESPACE_BEGIN(CryptoPP)
// Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x. Win32 lacks _mm_set_epi64x (Win64 supplies it except for VS2008).
// Also see http://stackoverflow.com/a/38547909/608639
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && ((__SUNPRO_CC >= 0x5100 && __SUNPRO_CC < 0x5130) || (_MSC_VER >= 1200 && _MSC_VER < 1600) || (defined(_M_IX86) && _MSC_VER >= 1600))
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && ((__SUNPRO_CC >= 0x5100 && __SUNPRO_CC < 0x5130) || (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(_M_IX86) && _MSC_VER >= 1600))
inline __m128i _mm_set_epi64x(const word64 a, const word64 b)
{
const word64 t[2] = {b,a}; __m128i r;