summaryrefslogtreecommitdiff
path: root/gcm.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2016-07-15 15:46:31 -0400
committerJeffrey Walton <noloader@gmail.com>2016-07-15 15:46:31 -0400
commitaae1f27deeaaf9082f2b3a459e9579ea6b5e4dc4 (patch)
treeccb002c88e615071fa1f4d228ec9ae2268df5470 /gcm.cpp
parentb1f5eb450c876937a986da0b33c40c881d8fb555 (diff)
downloadcryptopp-git-aae1f27deeaaf9082f2b3a459e9579ea6b5e4dc4.tar.gz
Fix SunCC crash and failed compile for gcm.cpp. This is the hammer - we don't enable any ASM for the source file (Issue 227)
Diffstat (limited to 'gcm.cpp')
-rw-r--r--gcm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcm.cpp b/gcm.cpp
index cf26eb3d..755f2e86 100644
--- a/gcm.cpp
+++ b/gcm.cpp
@@ -12,8 +12,8 @@
#ifndef CRYPTOPP_IMPORTS
#ifndef CRYPTOPP_GENERATE_X64_MASM
-// Clang 3.3 integrated assembler crash on Linux. MacPorts GCC compile error. SunCC crash under Sun Studio 12.5
-#if (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)) || defined(CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER) || ((__SUNPRO_CC <= 0x5140) && (CRYPTOPP_CXX11 >= 1))
+// Clang 3.3 integrated assembler crash on Linux. MacPorts GCC compile error. SunCC crash under Sun Studio 12.5 and below.
+#if (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)) || defined(CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER) || (__SUNPRO_CC <= 0x5140)
# undef CRYPTOPP_X86_ASM_AVAILABLE
# undef CRYPTOPP_X32_ASM_AVAILABLE
# undef CRYPTOPP_X64_ASM_AVAILABLE