diff options
author | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
---|---|---|
committer | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
commit | 7a467bbf07a3b7dd8a05c4205b636273d0ece341 (patch) | |
tree | 4ad992ea5b3608f960897ceefb644bff3815c2a7 /Compiler.cpp | |
parent | 2d69b269e9da0a8cab7ee4741e8442afa52feecb (diff) | |
parent | e4808305a17f43392e03e29546494d464c5f0895 (diff) | |
download | dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar.gz dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar.bz2 dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar.lz dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar.xz dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.tar.zst dexon-solidity-7a467bbf07a3b7dd8a05c4205b636273d0ece341.zip |
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
Diffstat (limited to 'Compiler.cpp')
-rw-r--r-- | Compiler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Compiler.cpp b/Compiler.cpp index 83954922..37b577cc 100644 --- a/Compiler.cpp +++ b/Compiler.cpp @@ -136,6 +136,7 @@ void Compiler::appendBaseConstructor(FunctionDefinition const& _constructor) FunctionType constructorType(_constructor); if (!constructorType.getParameterTypes().empty()) { + solAssert(m_baseArguments.count(&_constructor), ""); std::vector<ASTPointer<Expression>> const* arguments = m_baseArguments[&_constructor]; solAssert(arguments, ""); for (unsigned i = 0; i < arguments->size(); ++i) |