diff options
| author | Bob Summerwill <bob@summerwill.net> | 2016-03-22 07:06:36 +0800 |
|---|---|---|
| committer | Bob Summerwill <bob@summerwill.net> | 2016-03-22 07:06:36 +0800 |
| commit | e369e18584a60bd5d837c85860582aa692abbbf2 (patch) | |
| tree | 0236721a07bdd966964abcfe2871f637c61d0dab /test/boostTest.cpp | |
| parent | e759a248165b3141495a789fad158eef0cc22ac6 (diff) | |
| parent | 79ef51a7786612e15c20149a53d0a1ae01676fb8 (diff) | |
| download | dexon-solidity-e369e18584a60bd5d837c85860582aa692abbbf2.tar.gz dexon-solidity-e369e18584a60bd5d837c85860582aa692abbbf2.tar.zst dexon-solidity-e369e18584a60bd5d837c85860582aa692abbbf2.zip | |
Merge pull request #444 from bobsummerwill/fix_boost
Fix Windows warning for boost in solidity tests
Diffstat (limited to 'test/boostTest.cpp')
| -rw-r--r-- | test/boostTest.cpp | 10 |
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> |