cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizz

Browse Source
This commit is contained in:
Gav Wood 2015-07-20 17:54:52 +02:00
commit 189b298ae1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/SolidityEndToEndTest.cpp
View File

@ -1188,7 +1188,7 @@ BOOST_AUTO_TEST_CASE(now)
{
char const* sourceCode = "contract test {\n"
" function someInfo() returns (bool success) {\n"
" return block.timestamp() == now && now > 0;\n"
" return block.timestamp == now && now > 0;\n"
" }\n"
"}\n";
compileAndRun(sourceCode);

6
libsolidity/solidityExecutionFramework.h
View File

@ -41,7 +41,11 @@ namespace test
class ExecutionFramework
{
public:
ExecutionFramework() { g_logVerbosity = 0; }
ExecutionFramework()
{
g_logVerbosity = 0;
m_state.resetCurrent();
}
bytes const& compileAndRunWithoutCheck(
std::string const& _sourceCode,