diff options
author | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-06 19:50:04 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-06 19:50:04 +0800 |
commit | 3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688 (patch) | |
tree | 8658173b9923388ee1bd4fdb29719f7b5a74eb73 /libsolidity/ast | |
parent | 9d03de1f250cecad2c5c796beb10d96c3c9b15cd (diff) | |
parent | 3fcd62921ebcc8015d1d6829b818dea40e64e845 (diff) | |
download | dexon-solidity-3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688.tar dexon-solidity-3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688.tar.gz dexon-solidity-3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688.tar.bz2 dexon-solidity-3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688.tar.lz dexon-solidity-3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688.tar.xz dexon-solidity-3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688.tar.zst dexon-solidity-3481d4e2ec89cd3154ec3b5e41ccc7dec9b52688.zip |
Merge pull request #4690 from ethereum/equalParameterTypes
Renamed FunctionType::hasEqualArgumentTypes to FunctionType::hasEqual…
Diffstat (limited to 'libsolidity/ast')
-rw-r--r-- | libsolidity/ast/Types.cpp | 4 | ||||
-rw-r--r-- | libsolidity/ast/Types.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 0954fdf3..7bcae812 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -1871,7 +1871,7 @@ MemberList::MemberMap ContractType::nativeMembers(ContractDefinition const* _con continue; auto memberType = dynamic_cast<FunctionType const*>(member.type.get()); solAssert(!!memberType, "Override changes type."); - if (!memberType->hasEqualArgumentTypes(*functionType)) + if (!memberType->hasEqualParameterTypes(*functionType)) continue; functionWithEqualArgumentsFound = true; break; @@ -2825,7 +2825,7 @@ bool FunctionType::canTakeArguments(TypePointers const& _argumentTypes, TypePoin ); } -bool FunctionType::hasEqualArgumentTypes(FunctionType const& _other) const +bool FunctionType::hasEqualParameterTypes(FunctionType const& _other) const { if (m_parameterTypes.size() != _other.m_parameterTypes.size()) return false; diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index 12029a4e..89b8f170 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -1035,7 +1035,7 @@ public: /// expression the function is called on. bool canTakeArguments(TypePointers const& _arguments, TypePointer const& _selfType = TypePointer()) const; /// @returns true if the types of parameters are equal (doesn't check return parameter types) - bool hasEqualArgumentTypes(FunctionType const& _other) const; + bool hasEqualParameterTypes(FunctionType const& _other) const; /// @returns true if the ABI is used for this call (only meaningful for external calls) bool isBareCall() const; |