diff options
| author | chriseth <chris@ethereum.org> | 2017-07-31 22:14:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-31 22:14:46 +0800 |
| commit | c2215d4605d1fbcef1366d6b822ec610fc031b3c (patch) | |
| tree | 940ba55f0f27e8884332eaf90c11da48d5e98980 /libdevcore/CommonData.h | |
| parent | 0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14 (diff) | |
| parent | 2abfdb65c8dcda6866143280b7ff1bde094a1419 (diff) | |
| download | dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.gz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.bz2 dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.lz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.xz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.zst dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.zip | |
Merge pull request #2667 from ethereum/develop
Merge develop into release in proparation for 0.4.14
Diffstat (limited to 'libdevcore/CommonData.h')
| -rw-r--r-- | libdevcore/CommonData.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libdevcore/CommonData.h b/libdevcore/CommonData.h index 98ad548d..ab4bfe68 100644 --- a/libdevcore/CommonData.h +++ b/libdevcore/CommonData.h @@ -23,13 +23,14 @@ #pragma once +#include <libdevcore/Common.h> + #include <vector> #include <algorithm> #include <unordered_set> #include <type_traits> #include <cstring> #include <string> -#include "Common.h" namespace dev { @@ -165,6 +166,12 @@ template <class T, class U> std::vector<T>& operator+=(std::vector<T>& _a, U con _a.push_back(i); 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. template <class T> inline std::vector<T> operator+(std::vector<T> const& _a, std::vector<T> const& _b) |