diff options
author | Jeffrey Walton <noloader@gmail.com> | 2015-11-22 19:17:15 -0500 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2015-11-22 19:17:15 -0500 |
commit | 298988a5b9687f64de733ce01319e90e94b0b688 (patch) | |
tree | 8b026ad4838457e3e5385ff91380ead4499d30f5 /camellia.cpp | |
parent | 62618fda97bbde6d4cc4752101e69839fc4f3b6f (diff) | |
download | cryptopp-git-298988a5b9687f64de733ce01319e90e94b0b688.tar.gz |
Crypto++ 5.6.3 check-inCRYPTOPP_5_6_3
Diffstat (limited to 'camellia.cpp')
-rw-r--r-- | camellia.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/camellia.cpp b/camellia.cpp index 0323bdbe..1c37d4e8 100644 --- a/camellia.cpp +++ b/camellia.cpp @@ -13,7 +13,10 @@ See comments at top of rijndael.cpp for more details. #include "config.h"
#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4456 6246)
+# pragma warning(disable: 4456)
+# if (CRYPTOPP_MSC_VERSION >= 1400)
+# pragma warning(disable: 6246)
+# endif
#endif
#include "camellia.h"
|