diff options
author | LianaHus <liana@ethdev.com> | 2015-10-15 17:10:55 +0800 |
---|---|---|
committer | LianaHus <liana@ethdev.com> | 2015-10-15 17:10:55 +0800 |
commit | 7a7a7dcbb59e1126679e7e8f6eab16992fffb51c (patch) | |
tree | 02e06e723a1cd61ec57e23f8ceffc371eba4a806 /libsolidity/CompilerStack.cpp | |
parent | c3491e446964f366101f28e3d51ab59dd9aaa5b2 (diff) | |
download | dexon-solidity-7a7a7dcbb59e1126679e7e8f6eab16992fffb51c.tar.gz dexon-solidity-7a7a7dcbb59e1126679e7e8f6eab16992fffb51c.tar.zst dexon-solidity-7a7a7dcbb59e1126679e7e8f6eab16992fffb51c.zip |
fixes error after conflict resolving
Diffstat (limited to 'libsolidity/CompilerStack.cpp')
-rw-r--r-- | libsolidity/CompilerStack.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/CompilerStack.cpp index 3887999a..dd7f7dfc 100644 --- a/libsolidity/CompilerStack.cpp +++ b/libsolidity/CompilerStack.cpp @@ -140,7 +140,7 @@ bool CompilerStack::parse() { m_globalContext->setCurrentContract(*contract); resolver.updateDeclaration(*m_globalContext->currentThis()); - TypeChecker typeChecker; + TypeChecker typeChecker(m_errors); if (typeChecker.checkTypeRequirements(*contract)) { contract->setDevDocumentation(interfaceHandler.devDocumentation(*contract)); @@ -150,7 +150,6 @@ bool CompilerStack::parse() typesFine = false; m_contracts[contract->name()].contract = contract; - m_errors += typeChecker.errors(); } m_parseSuccessful = typesFine; return m_parseSuccessful; |