diff options
Diffstat (limited to 'vm.cpp')
| -rw-r--r-- | vm.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -21,8 +21,11 @@ */ #include <chrono> + +// Make sure boost/asio.hpp is included before windows.h. #include <boost/asio.hpp> #include <boost/filesystem.hpp> + #include <libethereum/Executive.h> #include <libevm/VMFactory.h> #include "vm.h" @@ -287,7 +290,7 @@ eth::OnOpFunc FakeExtVM::simpleTrace() /*add the storage*/ Object storage; for (auto const& i: std::get<2>(ext.addresses.find(ext.myAddress)->second)) - storage.push_back(Pair( (string)i.first , (string)i.second)); + storage.push_back(Pair( (string)i.first , (string)i.second)); /*add all the other details*/ o_step.push_back(Pair("storage", storage)); @@ -366,7 +369,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin) auto argc = boost::unit_test::framework::master_test_suite().argc; auto argv = boost::unit_test::framework::master_test_suite().argv; for (auto i = 0; i < argc; ++i) - { + { if (std::string(argv[i]) == "--show-times") { auto testDuration = endTime - startTime; |