diff options
author | Gav Wood <i@gavwood.com> | 2015-01-30 07:46:19 +0800 |
---|---|---|
committer | Gav Wood <i@gavwood.com> | 2015-01-30 07:46:19 +0800 |
commit | f46df7cb92bba6f30184cc47af3aab8cda672048 (patch) | |
tree | 13f827931b25db3f931aff495faef6d1fc41f547 /Types.cpp | |
parent | a604202f33f1f7dc3abda1080e1bc02b2a2cbcb3 (diff) | |
parent | cfb55901cc963523ca1defe232728f195a818228 (diff) | |
download | dexon-solidity-f46df7cb92bba6f30184cc47af3aab8cda672048.tar.gz dexon-solidity-f46df7cb92bba6f30184cc47af3aab8cda672048.tar.zst dexon-solidity-f46df7cb92bba6f30184cc47af3aab8cda672048.zip |
Merge branch 'sol_defaultFunction' of https://github.com/chriseth/cpp-ethereum into chriseth-sol_defaultFunction
Diffstat (limited to 'Types.cpp')
-rw-r--r-- | Types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -494,7 +494,7 @@ MemberList const& ContractType::getMembers() const { for (ContractDefinition const* base: m_contract.getLinearizedBaseContracts()) for (ASTPointer<FunctionDefinition> const& function: base->getDefinedFunctions()) - if (!function->isConstructor()) + if (!function->isConstructor() && !function->getName().empty()) members.insert(make_pair(function->getName(), make_shared<FunctionType>(*function, true))); } else @@ -808,7 +808,7 @@ MemberList const& TypeType::getMembers() const // We are accessing the type of a base contract, so add all public and private // functions. Note that this does not add inherited functions on purpose. for (ASTPointer<FunctionDefinition> const& f: contract.getDefinedFunctions()) - if (!f->isConstructor()) + if (!f->isConstructor() && !f->getName().empty()) members[f->getName()] = make_shared<FunctionType>(*f); } m_members.reset(new MemberList(members)); |