Merge pull request #1760 from evoskuil/master

Update variant forwarding macros to accept template args.

Author: evoskuil

include/bitcoin/system/chain/tapscript.hpp

@@ -35,7 +35,7 @@ class BC_API tapscript
 
     DEFAULT_COPY_MOVE_DESTRUCT(tapscript);
 
-    inline static bool is_control(const data_chunk& control) NOEXCEPT;
+    static inline bool is_control(const data_chunk& control) NOEXCEPT;
 
     inline tapscript(chunk_cptr&& control) NOEXCEPT;
     inline tapscript(const chunk_cptr& control) NOEXCEPT;

include/bitcoin/system/types.hpp

@@ -278,21 +278,21 @@ constexpr type(std::in_place_index_t<Index>, Args&&... args) NOEXCEPT \
 template <class Type, class... Args> \
 constexpr type& assign(std::in_place_type_t<Type>, Args&&... args) NOEXCEPT \
 { \
-    inner.emplace<Type>(std::forward<Args>(args)...); \
+    inner.template emplace<Type>(std::forward<Args>(args)...); \
     return *this; \
 } \
 template <size_t Index, class... Args> \
 constexpr type& assign(std::in_place_index_t<Index>, Args&&... args) NOEXCEPT \
 { \
-    inner.emplace<Index>(std::forward<Args>(args)...); \
+    inner.template emplace<Index>(std::forward<Args>(args)...); \
     return *this; \
 }
 
 /// Generate operator= overloads forwarding assignment for a specific alt type.
 #define FORWARD_ALTERNATIVE_VARIANT_ASSIGNMENT(type, Alternative, inner) \
 constexpr type& operator=(Alternative&& alternative) NOEXCEPT \
 { \
-    inner.emplace<Alternative>(std::forward<Alternative>(alternative)); \
+    inner.template emplace<Alternative>(std::forward<Alternative>(alternative)); \
     return *this; \
 }