Merge pull request #1740 from evoskuil/master

Move overload definition to types.

Author: evoskuil

include/bitcoin/system/define.hpp

@@ -32,6 +32,7 @@
 #include <stdexcept>        // purged
 #include <string>           // purged
 #include <type_traits>      // purged
+#include <variant>          // purged
 #include <vector>           // purged
 
 // Pulls in all /system headers (except settings.hpp).

include/bitcoin/system/impl/machine/stack_variant.ipp

@@ -21,7 +21,6 @@
 
 #include <tuple>
 #include <utility>
-#include <variant>
 #include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/math/math.hpp>

include/bitcoin/system/machine/stack.hpp

@@ -20,7 +20,6 @@
 #define LIBBITCOIN_SYSTEM_MACHINE_STACK_HPP
 
 #include <list>
-#include <variant>
 #include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/machine/number_boolean.hpp>
@@ -110,14 +109,6 @@ class stack
     mutable tether<data_chunk> tether_;
 };
 
-// For use with std::visit.
-template<class... Overload>
-struct overload : Overload... { using Overload::operator()...; };
-
-// clang++16 still requires.
-// Explicit deduction guide, should not be required in C++20 (namespace scope).
-template<class... Overload> overload(Overload...) -> overload<Overload...>;
-
 } // namespace machine
 } // namespace system
 } // namespace libbitcoin

include/bitcoin/system/types.hpp

@@ -20,6 +20,7 @@
 #define LIBBITCOIN_SYSTEM_TYPES_HPP
 
 #include <tuple>
+#include <variant>
 #include <bitcoin/system/allocator.hpp>
 
 namespace libbitcoin {
@@ -201,6 +202,16 @@ struct text_t
 BC_POP_WARNING()
 BC_POP_WARNING()
 
+/// Overload pattern.
+/// ---------------------------------------------------------------------------
+/// For use with std::visit.
+template<class... Overload>
+struct overload : Overload... { using Overload::operator()...; };
+
+/// clang++16 still requires.
+/// Explicit deduction guide, should not be required in C++20 (namespace scope).
+template<class... Overload> overload(Overload...) -> overload<Overload...>;
+
 /// Argument placeholders.
 /// ---------------------------------------------------------------------------