diff options
author | Paweł Bylica <pawel.bylica@imapp.pl> | 2014-12-12 16:51:49 +0800 |
---|---|---|
committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2014-12-12 16:51:49 +0800 |
commit | 0d7f0a01fd9152bc641758331bd32d620f7c20dd (patch) | |
tree | 5f8ca29750e86e59b69c51b5a02fc955a585ca2b /vm.cpp | |
parent | 3ba2d4195fa4d5fd9565345bec34f6aeeae4bb7e (diff) | |
parent | 6b8bc1669e0f2e5ade21ad6ae6cc4ef7e024dd2c (diff) | |
download | dexon-solidity-0d7f0a01fd9152bc641758331bd32d620f7c20dd.tar dexon-solidity-0d7f0a01fd9152bc641758331bd32d620f7c20dd.tar.gz dexon-solidity-0d7f0a01fd9152bc641758331bd32d620f7c20dd.tar.bz2 dexon-solidity-0d7f0a01fd9152bc641758331bd32d620f7c20dd.tar.lz dexon-solidity-0d7f0a01fd9152bc641758331bd32d620f7c20dd.tar.xz dexon-solidity-0d7f0a01fd9152bc641758331bd32d620f7c20dd.tar.zst dexon-solidity-0d7f0a01fd9152bc641758331bd32d620f7c20dd.zip |
Merge remote-tracking branch 'origin/vm' into develop-evmcc
Diffstat (limited to 'vm.cpp')
-rw-r--r-- | vm.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -244,10 +244,11 @@ void FakeExtVM::importCallCreates(mArray& _callcreates) eth::OnOpFunc FakeExtVM::simpleTrace() { - return [](uint64_t steps, eth::Instruction inst, bigint newMemSize, bigint gasCost, void* voidVM, void const* voidExt) + + return [](uint64_t steps, eth::Instruction inst, bigint newMemSize, bigint gasCost, dev::eth::VM* voidVM, dev::eth::ExtVMFace const* voidExt) { - FakeExtVM const& ext = *(FakeExtVM const*)voidExt; - eth::VM& vm = *(eth::VM*)voidVM; + FakeExtVM const& ext = *static_cast<FakeExtVM const*>(voidExt); + eth::VM& vm = *voidVM; std::ostringstream o; o << std::endl << " STACK" << std::endl; |