aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorBob Summerwill <bob@summerwill.net>2016-03-22 07:05:30 +0800
committerBob Summerwill <bob@summerwill.net>2016-03-22 07:05:30 +0800
commit79ef51a7786612e15c20149a53d0a1ae01676fb8 (patch)
tree0236721a07bdd966964abcfe2871f637c61d0dab /test
parente759a248165b3141495a789fad158eef0cc22ac6 (diff)
downloaddexon-solidity-79ef51a7786612e15c20149a53d0a1ae01676fb8.tar
dexon-solidity-79ef51a7786612e15c20149a53d0a1ae01676fb8.tar.gz
dexon-solidity-79ef51a7786612e15c20149a53d0a1ae01676fb8.tar.bz2
dexon-solidity-79ef51a7786612e15c20149a53d0a1ae01676fb8.tar.lz
dexon-solidity-79ef51a7786612e15c20149a53d0a1ae01676fb8.tar.xz
dexon-solidity-79ef51a7786612e15c20149a53d0a1ae01676fb8.tar.zst
dexon-solidity-79ef51a7786612e15c20149a53d0a1ae01676fb8.zip
Fix Windows warning for boost in solidity tests.
We need this fixed before we can enable warnings-as-errors.
Diffstat (limited to 'test')
-rw-r--r--test/boostTest.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index f3400a31..a2cfa5ee 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -24,8 +24,16 @@
#define BOOST_TEST_MODULE EthereumTests
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
-//#define BOOST_DISABLE_WIN32 //disables SEH warning
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4535) // calling _set_se_translator requires /EHa
+#endif
#include <boost/test/included/unit_test.hpp>
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
#pragma GCC diagnostic pop
#include <test/TestHelper.h>