From 44de325d95447498036479c3112ba741caf45bf6 Mon Sep 17 00:00:00 2001 From: TheCharlatan Date: Wed, 17 May 2023 17:40:32 +0200 Subject: [PATCH] refactor: Split util::insert into its own file --- src/Makefile.am | 1 + src/util/insert.h | 24 ++++++++++++++++++++++++ src/util/system.h | 10 ---------- src/wallet/coinselection.h | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 src/util/insert.h diff --git a/src/Makefile.am b/src/Makefile.am index 9764df7fbc6..c952d737584 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 00000000000..5332eca60a3 --- /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 + +namespace util { + +//! Simplification of std insertion +template +inline void insert(Tdst& dst, const Tsrc& src) { + dst.insert(dst.begin(), src.begin(), src.end()); +} +template +inline void insert(std::set& 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 a8c049ad441..463713d565a 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -38,16 +38,6 @@ int GetNumCores(); namespace util { -//! Simplification of std insertion -template -inline void insert(Tdst& dst, const Tsrc& src) { - dst.insert(dst.begin(), src.begin(), src.end()); -} -template -inline void insert(std::set& 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 723f5bbfb3a..432d7d14314 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -11,8 +11,8 @@ #include #include #include -#include #include +#include #include #include