aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2014-12-12 03:07:07 +0800
committerGav Wood <i@gavwood.com>2014-12-12 03:07:07 +0800
commit1d879a9bb451943add6bb2bd68cad3c79e6aa50e (patch)
tree4890b044c80b9b12023f63da1fe330245e738ef4
parent1db9bc1651c4ee2c40cb603ea33b291ac96754ce (diff)
downloaddexon-solidity-1d879a9bb451943add6bb2bd68cad3c79e6aa50e.tar.gz
dexon-solidity-1d879a9bb451943add6bb2bd68cad3c79e6aa50e.tar.zst
dexon-solidity-1d879a9bb451943add6bb2bd68cad3c79e6aa50e.zip
Remove extraneous old stuff for PoC-7.
Fix gas remaining issue.
-rw-r--r--vm.cpp7
-rw-r--r--vm.h3
2 files changed, 4 insertions, 6 deletions
diff --git a/vm.cpp b/vm.cpp
index 5c270f78..8fe378ce 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -241,10 +241,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;
diff --git a/vm.h b/vm.h
index a52a02e3..3d4b88d5 100644
--- a/vm.h
+++ b/vm.h
@@ -80,9 +80,6 @@ public:
bytes thisTxData;
bytes thisTxCode;
u256 gas;
-
-private:
- eth::Manifest m_ms;
};