cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add template for merging sets

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-07-14 01:17:52 +02:00
parent 89a1e97e7d
commit f3e591eedd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libdevcore/CommonData.h
View File

@ -166,6 +166,12 @@ template <class T, class U> std::vector<T>& operator+=(std::vector<T>& _a, U con
_a.push_back(i); _a.push_back(i);
return _a; return _a;
} }
/// Concatenate the contents of a container onto a set
template <class T, class U> std::set<T>& operator+=(std::set<T>& _a, U const& _b)
{
_a.insert(_b.begin(), _b.end());
return _a;
}
/// Concatenate two vectors of elements. /// Concatenate two vectors of elements.
template <class T> template <class T>
inline std::vector<T> operator+(std::vector<T> const& _a, std::vector<T> const& _b) inline std::vector<T> operator+(std::vector<T> const& _a, std::vector<T> const& _b)

5
libsolidity/ast/AST.cpp
View File

@ -95,10 +95,7 @@ set<SourceUnit const*> SourceUnit::referencedSourceUnits(bool _recurse, set<Sour
_skipList.insert(sourceUnit); _skipList.insert(sourceUnit);
sourceUnits.insert(sourceUnit); sourceUnits.insert(sourceUnit);
if (_recurse) if (_recurse)
{ sourceUnits += sourceUnit->referencedSourceUnits(true, _skipList);
set<SourceUnit const*> referencedSourceUnits = sourceUnit->referencedSourceUnits(true, _skipList);
sourceUnits.insert(referencedSourceUnits.begin(), referencedSourceUnits.end());
}
} }
} }
return sourceUnits; return sourceUnits;