Merge pull request #6578 from ethereum/fix_base_overload

Fix call to base class overloaded functions
This commit is contained in:
chriseth
2019-04-29 14:33:52 +02:00
committed by GitHub
4 changed files with 81 additions and 5 deletions
+1 -5
View File
@@ -215,16 +215,12 @@ vector<Declaration const*> const& ContractDefinition::inheritableMembers() const
{
if (!m_inheritableMembers)
{
set<string> memberSeen;
m_inheritableMembers.reset(new vector<Declaration const*>());
auto addInheritableMember = [&](Declaration const* _decl)
{
solAssert(_decl, "addInheritableMember got a nullpointer.");
if (memberSeen.count(_decl->name()) == 0 && _decl->isVisibleInDerivedContracts())
{
memberSeen.insert(_decl->name());
if (_decl->isVisibleInDerivedContracts())
m_inheritableMembers->push_back(_decl);
}
};
for (FunctionDefinition const* f: definedFunctions())