diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2023-05-17 17:40:32 +0200 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2023-05-20 12:03:31 +0200 |
| commit | 44de325d95447498036479c3112ba741caf45bf6 (patch) | |
| tree | 9bc11783c5552de98b2aeac6bbd1456d5031ae9d /src | |
| parent | 9ec5da36b62276ae22e348f26f88aaf646357d6d (diff) | |
refactor: Split util::insert into its own file
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/util/insert.h | 24 | ||||
| -rw-r--r-- | src/util/system.h | 10 | ||||
| -rw-r--r-- | src/wallet/coinselection.h | 2 |
4 files changed, 26 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9764df7fbc..c952d73758 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -297,6 +297,7 @@ BITCOIN_CORE_H = \ util/golombrice.h \ util/hash_type.h \ util/hasher.h \ + util/insert.h \ util/macros.h \ util/message.h \ util/moneystr.h \ diff --git a/src/util/insert.h b/src/util/insert.h new file mode 100644 index 0000000000..5332eca60a --- /dev/null +++ b/src/util/insert.h @@ -0,0 +1,24 @@ +// Copyright (c) 2023 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_UTIL_INSERT_H +#define BITCOIN_UTIL_INSERT_H + +#include <set> + +namespace util { + +//! Simplification of std insertion +template <typename Tdst, typename Tsrc> +inline void insert(Tdst& dst, const Tsrc& src) { + dst.insert(dst.begin(), src.begin(), src.end()); +} +template <typename TsetT, typename Tsrc> +inline void insert(std::set<TsetT>& dst, const Tsrc& src) { + dst.insert(src.begin(), src.end()); +} + +} // namespace util + +#endif // BITCOIN_UTIL_INSERT_H diff --git a/src/util/system.h b/src/util/system.h index a8c049ad44..463713d565 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -38,16 +38,6 @@ int GetNumCores(); namespace util { -//! Simplification of std insertion -template <typename Tdst, typename Tsrc> -inline void insert(Tdst& dst, const Tsrc& src) { - dst.insert(dst.begin(), src.begin(), src.end()); -} -template <typename TsetT, typename Tsrc> -inline void insert(std::set<TsetT>& dst, const Tsrc& src) { - dst.insert(src.begin(), src.end()); -} - /** * Helper function to access the contained object of a std::any instance. * Returns a pointer to the object if passed instance has a value and the type diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 723f5bbfb3..432d7d1431 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -11,8 +11,8 @@ #include <policy/feerate.h> #include <primitives/transaction.h> #include <random.h> -#include <util/system.h> #include <util/check.h> +#include <util/insert.h> #include <util/result.h> #include <optional> |