aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/solidityExecutionFramework.h
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-06-16 22:19:42 +0800
committerchriseth <c@ethdev.com>2015-06-16 22:19:42 +0800
commitbc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1 (patch)
treecaeeade082bc2fb1ca7985c44ad1caae97d80b93 /libsolidity/solidityExecutionFramework.h
parentce60e42f39b94d027ec55d9278409ac7dcff35d5 (diff)
parente7906ba1beecf9fd04d9e3476da7a66d61714629 (diff)
downloaddexon-solidity-bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1.tar
dexon-solidity-bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1.tar.gz
dexon-solidity-bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1.tar.bz2
dexon-solidity-bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1.tar.lz
dexon-solidity-bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1.tar.xz
dexon-solidity-bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1.tar.zst
dexon-solidity-bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1.zip
Merge pull request #2199 from chriseth/sol_memoryArrays4
Copying between memory and memory.
Diffstat (limited to 'libsolidity/solidityExecutionFramework.h')
-rw-r--r--libsolidity/solidityExecutionFramework.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h
index 44590b1c..4ba22981 100644
--- a/libsolidity/solidityExecutionFramework.h
+++ b/libsolidity/solidityExecutionFramework.h
@@ -174,11 +174,11 @@ protected:
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
BOOST_REQUIRE(!executive.call(m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas));
}
- BOOST_REQUIRE(executive.go());
+ BOOST_REQUIRE(executive.go(/* DEBUG eth::Executive::simpleTrace() */));
m_state.noteSending(m_sender);
executive.finalize();
- m_gasUsed = executive.gasUsed();
- m_output = std::move(res.output); // FIXME: Looks like Framework needs ExecutiveResult embedded
+ m_gasUsed = res.gasUsed;
+ m_output = std::move(res.output);
m_logs = executive.logs();
}