summaryrefslogtreecommitdiff
path: root/algparam.h
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2017-06-02 05:18:52 -0400
committerJeffrey Walton <noloader@gmail.com>2017-06-02 05:18:52 -0400
commit7ac77ca9ac780a3b027e59d23433a5e1e027e93f (patch)
treea0ef6365da4f658f632316fbd4d0804dd20e713f /algparam.h
parentc3871aec948013c1a4d5613050c659520f59e2e4 (diff)
downloadcryptopp-git-7ac77ca9ac780a3b027e59d23433a5e1e027e93f.tar.gz
Revert "Revert "Clear Visual Studio warnings (Issue 412)""
This reverts commit c3871aec948013c1a4d5613050c659520f59e2e4.
Diffstat (limited to 'algparam.h')
-rw-r--r--algparam.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/algparam.h b/algparam.h
index aceaba4e..95399615 100644
--- a/algparam.h
+++ b/algparam.h
@@ -11,10 +11,12 @@
#include "config.h"
#include "cryptlib.h"
-// TODO: fix 6011 when the API/ABI can change
-#if (CRYPTOPP_MSC_VERSION >= 1400)
+#if CRYPTOPP_MSC_VERSION
# pragma warning(push)
-# pragma warning(disable: 6011 28193)
+# pragma warning(disable: 4231 4275)
+# if (CRYPTOPP_MSC_VERSION >= 1400)
+# pragma warning(disable: 6011 6386 28193)
+# endif
#endif
#include "smartptr.h"