diff options
| author | Lefteris Karapetsas <lefteris@refu.co> | 2015-01-30 00:28:14 +0800 |
|---|---|---|
| committer | Lefteris Karapetsas <lefteris@refu.co> | 2015-01-30 01:21:51 +0800 |
| commit | 04190798eba7a2996b28aee6d74b1c636f575a02 (patch) | |
| tree | 2a5fb37440bed96c96ecfcfda494fd1b436b3118 /AST.cpp | |
| parent | dcd47be6ca8b408b384dca9737625873ad279464 (diff) | |
| download | dexon-solidity-04190798eba7a2996b28aee6d74b1c636f575a02.tar.gz dexon-solidity-04190798eba7a2996b28aee6d74b1c636f575a02.tar.zst dexon-solidity-04190798eba7a2996b28aee6d74b1c636f575a02.zip | |
Minor fixes plus a rebase merge fix
Diffstat (limited to 'AST.cpp')
| -rw-r--r-- | AST.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -83,7 +83,6 @@ map<FixedHash<4>, FunctionTypePointer> ContractDefinition::getInterfaceFunctions map<FixedHash<4>, FunctionTypePointer> exportedFunctions; for (auto const& it: exportedFunctionList) - // exportedFunctions.insert(make_pair(std::get<0>(it), FunctionDescription(std::get<1>(it), std::get<2>(it)))); exportedFunctions.insert(it); solAssert(exportedFunctionList.size() == exportedFunctions.size(), @@ -139,12 +138,12 @@ void ContractDefinition::checkIllegalOverrides() const } } -vector<pair<FixedHash<4>, shared_ptr<FunctionType const>>> const& ContractDefinition::getInterfaceFunctionList() const +vector<pair<FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::getInterfaceFunctionList() const { if (!m_interfaceFunctionList) { set<string> functionsSeen; - m_interfaceFunctionList.reset(new vector<pair<FixedHash<4>, shared_ptr<FunctionType const>>>()); + m_interfaceFunctionList.reset(new vector<pair<FixedHash<4>, FunctionTypePointer>>()); for (ContractDefinition const* contract: getLinearizedBaseContracts()) { for (ASTPointer<FunctionDefinition> const& f: contract->getDefinedFunctions()) |