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

test/TestHelper.cpp

@@ -330,11 +330,11 @@ void checkStorage(map<u256, u256> _expectedStore, map<u256, u256> _resultStore,
 		}
 	}
 	BOOST_CHECK_EQUAL(_resultStore.size(), _expectedStore.size());
-#ifndef __WIN32__
 	for (auto&& resultStorePair : _resultStore)
+	{
 		if (!_expectedStore.count(resultStorePair.first))
 			BOOST_ERROR(_expectedAddr << ": unexpected store key " << resultStorePair.first);
-#endif
+	}
 }
 
 void checkLog(LogEntries _resultLogs, LogEntries _expectedLogs)

test/solidityEndToEndTest.cpp

@@ -402,7 +402,7 @@ BOOST_AUTO_TEST_CASE(empty_string_on_stack)
 							 "  }\n"
 							 "}\n";
 	compileAndRun(sourceCode);
-	BOOST_CHECK(callContractFunction(0, bytes({0x02})) == bytes({0x00, 0x02, (byte)'a', (byte)'b', (byte)'c', 0x00}));
+	BOOST_CHECK(callContractFunction(0, bytes({0x02})) == bytes({0x00, 0x02, 0x61/*'a'*/, 0x62/*'b'*/, 0x63/*'c'*/, 0x00}));
 }
 
 BOOST_AUTO_TEST_CASE(state_smoke_test)