Skip to content

Update FORWARD_VARIANT_CONSTRUCT() for non-optional inner. #1747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
Oct 30, 2025
Merged

Update FORWARD_VARIANT_CONSTRUCT() for non-optional inner. #1747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/bitcoin/system/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ template<class... Overload> overload(Overload...) -> overload<Overload...>;
/// Declare on struct to define constructors that forward to an inner variant.
#define FORWARD_VARIANT_CONSTRUCT(type, inner) \
template <class Type, class... Args> \
constexpr type(std::in_place_type_t<Type >, Args&&... args) NOEXCEPT \
constexpr type(std::in_place_type_t<Type>, Args&&... args) NOEXCEPT \
: inner(std::in_place_type<Type>, std::forward<Args>(args)...) \
{ \
} \
Expand Down Expand Up @@ -245,7 +245,7 @@ constexpr type& assign(std::in_place_index_t<Index>, Args&&... args) NOEXCEPT \
#define FORWARD_ALTERNATIVE_VARIANT_ASSIGNMENT(type, Alternative, inner) \
type& operator=(Alternative&& alternative) NOEXCEPT \
{ \
inner.emplace(std::forward<Alternative>(alternative)); \
inner.emplace<Alternative>(std::forward<Alternative>(alternative)); \
return *this; \
}

Expand Down
Loading