aboutsummaryrefslogtreecommitdiffstats
path: root/vm.cpp
diff options
context:
space:
mode:
authorjhuntley <jhuntley@houghtonassociates.com>2015-02-10 00:31:04 +0800
committerjhuntley <jhuntley@houghtonassociates.com>2015-03-05 00:17:46 +0800
commit5ae585f7cf21ae281f564d0edbad1251129f256d (patch)
tree14c0030e81631ca06fb21a67aa20bf1d2957348e /vm.cpp
parentb6b80b020006e269c877faee85f6664a1cd925a0 (diff)
downloaddexon-solidity-5ae585f7cf21ae281f564d0edbad1251129f256d.tar
dexon-solidity-5ae585f7cf21ae281f564d0edbad1251129f256d.tar.gz
dexon-solidity-5ae585f7cf21ae281f564d0edbad1251129f256d.tar.bz2
dexon-solidity-5ae585f7cf21ae281f564d0edbad1251129f256d.tar.lz
dexon-solidity-5ae585f7cf21ae281f564d0edbad1251129f256d.tar.xz
dexon-solidity-5ae585f7cf21ae281f564d0edbad1251129f256d.tar.zst
dexon-solidity-5ae585f7cf21ae281f564d0edbad1251129f256d.zip
asio.h and windows.h build comments as per request.
Diffstat (limited to 'vm.cpp')
-rw-r--r--vm.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/vm.cpp b/vm.cpp
index 423d55ac..00ba82aa 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -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;