Merge remote-tracking branch 'upstream/develop' into randomTestEfficiency

3 files changed, 6 insertions, 2 deletions

diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index 2afe875f..9543497a 100644
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -28,6 +28,10 @@
 #include <libdevcrypto/SHA3.h>
 #include <test/solidityExecutionFramework.h>
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4307) //integral constant overflow for high_bits_cleaning
+#endif
+
 using namespace std;
 
 namespace dev
diff --git a/boostTest.cpp b/boostTest.cpp
index cef3cc0a..1523a7a1 100644
--- a/boostTest.cpp
+++ b/boostTest.cpp
@@ -23,6 +23,6 @@
 #define BOOST_TEST_MODULE EthereumTests
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
+#define BOOST_DISABLE_WIN32 //disables SEH warning
 #include <boost/test/included/unit_test.hpp>
-#pragma warning(pop)
 #pragma GCC diagnostic pop
diff --git a/vm.cpp b/vm.cpp
index 6ae95f25..8b8c75a0 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -345,7 +345,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 			output = vm->go(fev, fev.simpleTrace()).toBytes();
 			gas = vm->gas();
 		}
-		catch (VMException const& _e)
+		catch (VMException const&)
 		{
 			cnote << "Safe VM Exception";
 			vmExceptionOccured = true;