diff options
author | CJentzsch <jentzsch.software@gmail.com> | 2015-08-15 05:28:16 +0800 |
---|---|---|
committer | CJentzsch <jentzsch.software@gmail.com> | 2015-08-15 05:28:16 +0800 |
commit | 1e91c8be2b9bc6209eca0d5c8311153d33279619 (patch) | |
tree | 478521997ac71a5cfe91a4016944e2fe63d374af /libsolidity/solidityExecutionFramework.h | |
parent | f43d2d08db90863f8c9ac284fc3d37ac4636ff84 (diff) | |
parent | 95974f1a92f690a0502dd01b382fccf3a29dc947 (diff) | |
download | dexon-solidity-1e91c8be2b9bc6209eca0d5c8311153d33279619.tar dexon-solidity-1e91c8be2b9bc6209eca0d5c8311153d33279619.tar.gz dexon-solidity-1e91c8be2b9bc6209eca0d5c8311153d33279619.tar.bz2 dexon-solidity-1e91c8be2b9bc6209eca0d5c8311153d33279619.tar.lz dexon-solidity-1e91c8be2b9bc6209eca0d5c8311153d33279619.tar.xz dexon-solidity-1e91c8be2b9bc6209eca0d5c8311153d33279619.tar.zst dexon-solidity-1e91c8be2b9bc6209eca0d5c8311153d33279619.zip |
Merge remote-tracking branch 'upstream/develop' into winsvegaBlock2
Conflicts:
test/libethereum/blockchain.cpp
Diffstat (limited to 'libsolidity/solidityExecutionFramework.h')
-rw-r--r-- | libsolidity/solidityExecutionFramework.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h index 98241b2f..05f93bb6 100644 --- a/libsolidity/solidityExecutionFramework.h +++ b/libsolidity/solidityExecutionFramework.h @@ -44,7 +44,9 @@ class ExecutionFramework public: ExecutionFramework() { - g_logVerbosity = 0; + if (g_logVerbosity != -1) + g_logVerbosity = 0; + //m_state.resetCurrent(); } bytes const& compileAndRunWithoutCheck( |