diff options
| author | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-11-10 14:15:27 +0800 |
|---|---|---|
| committer | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-11-10 14:15:27 +0800 |
| commit | 43bab79fbc08c858a2f7a83529111ac6fffa3a77 (patch) | |
| tree | f89b0dc5b886cc18c4e3f21cf76551c3303912c2 /vm.cpp | |
| parent | b4d8ff5fdc82a1b93defa94cb3b0a075f13600f7 (diff) | |
| parent | 215e9e2657749591e1d698d036e5393c722a2fcf (diff) | |
| download | dexon-solidity-43bab79fbc08c858a2f7a83529111ac6fffa3a77.tar dexon-solidity-43bab79fbc08c858a2f7a83529111ac6fffa3a77.tar.gz dexon-solidity-43bab79fbc08c858a2f7a83529111ac6fffa3a77.tar.bz2 dexon-solidity-43bab79fbc08c858a2f7a83529111ac6fffa3a77.tar.lz dexon-solidity-43bab79fbc08c858a2f7a83529111ac6fffa3a77.tar.xz dexon-solidity-43bab79fbc08c858a2f7a83529111ac6fffa3a77.tar.zst dexon-solidity-43bab79fbc08c858a2f7a83529111ac6fffa3a77.zip | |
Merge remote-tracking branch 'upstream/develop' into NewStateTests
Conflicts:
test/state.cpp
test/tmpFiller.json
Diffstat (limited to 'vm.cpp')
| -rw-r--r-- | vm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -290,7 +290,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin) o["pre"] = mValue(fev.exportState()); fev.importExec(o["exec"].get_obj()); - if (!fev.code.size()) + if (fev.code.empty()) { fev.thisTxCode = get<3>(fev.addresses.at(fev.myAddress)); fev.code = fev.thisTxCode; |