cerc-io/solidity
15
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 pull request #10511 from ethereum/fixmergeBreaking

Browse Source 
Fix merge conflict.
This commit is contained in:
chriseth 2020-12-07 14:37:40 +01:00 committed by GitHub
commit ddbbfcd868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/formal/SMTEncoder.cpp
View File

@ -2573,7 +2573,7 @@ map<ContractDefinition const*, vector<ASTPointer<frontend::Expression>>> SMTEnco
if (auto constructor = contract->constructor()) if (auto constructor = contract->constructor())
for (auto mod: constructor->modifiers()) for (auto mod: constructor->modifiers())
{ {
auto decl = mod->name()->annotation().referencedDeclaration; auto decl = mod->name().annotation().referencedDeclaration;
if (auto base = dynamic_cast<ContractDefinition const*>(decl)) if (auto base = dynamic_cast<ContractDefinition const*>(decl))
{ {
solAssert(!baseArgs.count(base), ""); solAssert(!baseArgs.count(base), "");