Fix compile under VS2012 X86

pull/253/head
Jeffrey Walton 2016-08-21 04:36:32 -04:00
parent cd3dd25b12
commit 898d6a3f78
2 changed files with 2 additions and 1 deletions

View File

@ -25,7 +25,7 @@ NAMESPACE_BEGIN(CryptoPP)
// Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x. // Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x.
// Also see http://stackoverflow.com/a/38547909/608639 // 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) || (_MSC_VER >= 1200 && _MSC_VER < 1600) || (defined(_M_IX86) && _MSC_VER >= 1600 && _MSC_VER <= 1700))
inline __m128i _mm_set_epi64x(const word64 a, const word64 b) inline __m128i _mm_set_epi64x(const word64 a, const word64 b)
{ {
union INT_128_64x2 { union INT_128_64x2 {

View File

@ -832,6 +832,7 @@ bool TestHuffmanCodes()
} }
catch(const Exception& ex) catch(const Exception& ex)
{ {
CRYPTOPP_UNUSED(ex);
return false; return false;
} }