diff options
| author | Dimitry <dimitry@ethdev.com> | 2015-08-11 19:30:35 +0800 |
|---|---|---|
| committer | Dimitry <dimitry@ethdev.com> | 2015-08-12 23:11:32 +0800 |
| commit | c0aa9f67267f7eb151b4e8322d313f846cffc244 (patch) | |
| tree | d629422d3f159f1b6b1da4534f34baee1f307139 | |
| parent | d6d8951baf6f36e3d73727a9e6a24860c659caf8 (diff) | |
| download | dexon-solidity-c0aa9f67267f7eb151b4e8322d313f846cffc244.tar dexon-solidity-c0aa9f67267f7eb151b4e8322d313f846cffc244.tar.gz dexon-solidity-c0aa9f67267f7eb151b4e8322d313f846cffc244.tar.bz2 dexon-solidity-c0aa9f67267f7eb151b4e8322d313f846cffc244.tar.lz dexon-solidity-c0aa9f67267f7eb151b4e8322d313f846cffc244.tar.xz dexon-solidity-c0aa9f67267f7eb151b4e8322d313f846cffc244.tar.zst dexon-solidity-c0aa9f67267f7eb151b4e8322d313f846cffc244.zip | |
error report: merge with latesd develop
| -rw-r--r-- | TestHelper.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/solidityExecutionFramework.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 80b4214c..3869613c 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -320,7 +320,7 @@ int ImportTest::exportTest(bytes const& _output) { int err = 0; // export output - m_TestObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add); + m_testObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add); // compare expected output with post output if (m_testObject.count("expectOut") > 0) diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h index aac033b5..05f93bb6 100644 --- a/libsolidity/solidityExecutionFramework.h +++ b/libsolidity/solidityExecutionFramework.h @@ -46,7 +46,7 @@ public: { if (g_logVerbosity != -1) g_logVerbosity = 0; - m_state.resetCurrent(); + //m_state.resetCurrent(); } bytes const& compileAndRunWithoutCheck( |