diff options
| author | chriseth <chris@ethereum.org> | 2018-12-20 01:06:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 01:06:13 +0800 |
| commit | 1df8f40cd2fd7b47698d847907b8ca7b47eb488d (patch) | |
| tree | 5ed5816fe2d1a8a207e750d39884aca7957c8289 /libsolidity/analysis/ContractLevelChecker.cpp | |
| parent | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (diff) | |
| parent | ddf54b21d1d002903624f61173ab4af197f50053 (diff) | |
| download | dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.gz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.bz2 dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.lz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.xz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.zst dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.zip | |
Merge pull request #5697 from ethereum/develop
Merge develop into release for 0.5.2
Diffstat (limited to 'libsolidity/analysis/ContractLevelChecker.cpp')
| -rw-r--r-- | libsolidity/analysis/ContractLevelChecker.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libsolidity/analysis/ContractLevelChecker.cpp b/libsolidity/analysis/ContractLevelChecker.cpp index 6dc564de..96b9611e 100644 --- a/libsolidity/analysis/ContractLevelChecker.cpp +++ b/libsolidity/analysis/ContractLevelChecker.cpp @@ -20,10 +20,9 @@ */ #include <libsolidity/analysis/ContractLevelChecker.h> -#include <libsolidity/ast/AST.h> +#include <libsolidity/ast/AST.h> #include <liblangutil/ErrorReporter.h> - #include <boost/range/adaptor/reversed.hpp> @@ -227,7 +226,7 @@ void ContractLevelChecker::checkAbstractFunctions(ContractDefinition const& _con return _type->hasEqualParameterTypes(*_funAndFlag.first); }); if (it == overloads.end()) - overloads.push_back(make_pair(_type, _implemented)); + overloads.emplace_back(_type, _implemented); else if (it->second) { if (!_implemented) @@ -409,8 +408,8 @@ void ContractLevelChecker::checkExternalTypeClashes(ContractDefinition const& _c auto functionType = make_shared<FunctionType>(*f); // under non error circumstances this should be true if (functionType->interfaceFunctionType()) - externalDeclarations[functionType->externalSignature()].push_back( - make_pair(f, functionType->asCallableFunction(false)) + externalDeclarations[functionType->externalSignature()].emplace_back( + f, functionType->asCallableFunction(false) ); } for (VariableDeclaration const* v: contract->stateVariables()) @@ -419,8 +418,8 @@ void ContractLevelChecker::checkExternalTypeClashes(ContractDefinition const& _c auto functionType = make_shared<FunctionType>(*v); // under non error circumstances this should be true if (functionType->interfaceFunctionType()) - externalDeclarations[functionType->externalSignature()].push_back( - make_pair(v, functionType->asCallableFunction(false)) + externalDeclarations[functionType->externalSignature()].emplace_back( + v, functionType->asCallableFunction(false) ); } } |