diff options
author | Gav Wood <g@ethdev.com> | 2015-03-05 05:49:47 +0800 |
---|---|---|
committer | Gav Wood <g@ethdev.com> | 2015-03-05 05:49:47 +0800 |
commit | 0c2a7fbe7d2283a2226cf693d94a087ddca56b04 (patch) | |
tree | a8bf8cf138f206f8d37dcc1429b0e4e65ab0e126 /vm.cpp | |
parent | 713e5e5d1e9c467c612aded7a907951e6c3a4f9c (diff) | |
parent | e229b5d291eefbf05e77988149d3ba2dc0059575 (diff) | |
download | dexon-solidity-0c2a7fbe7d2283a2226cf693d94a087ddca56b04.tar dexon-solidity-0c2a7fbe7d2283a2226cf693d94a087ddca56b04.tar.gz dexon-solidity-0c2a7fbe7d2283a2226cf693d94a087ddca56b04.tar.bz2 dexon-solidity-0c2a7fbe7d2283a2226cf693d94a087ddca56b04.tar.lz dexon-solidity-0c2a7fbe7d2283a2226cf693d94a087ddca56b04.tar.xz dexon-solidity-0c2a7fbe7d2283a2226cf693d94a087ddca56b04.tar.zst dexon-solidity-0c2a7fbe7d2283a2226cf693d94a087ddca56b04.zip |
Merge pull request #1186 from onepremise/develop
Updates for Building all cpp-ethereum on MinGW(64)
Diffstat (limited to 'vm.cpp')
-rw-r--r-- | vm.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -21,7 +21,9 @@ */ #include <chrono> + #include <boost/filesystem.hpp> + #include <libethereum/Executive.h> #include <libevm/VMFactory.h> #include "vm.h" @@ -286,7 +288,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)); @@ -365,7 +367,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; |