Skip to content

Split type_list and pack indexing to a separate header #93

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
saki7 merged 1 commit into from
Sep 23, 2026
Merged

Split type_list and pack indexing to a separate header #93

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion include/iris/alloy/adapt.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <iris/config.hpp> // IWYU pragma: keep

#include <iris/type_traits.hpp> // IWYU pragma: keep
#include <iris/type_list.hpp> // IWYU pragma: keep

#include <iris/pp/comma.hpp>
#include <iris/pp/seq.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/iris/alloy/detail/preprocessed/tuple_impl.hpp.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <iris/alloy/traits.hpp>

#include <iris/type_traits.hpp>
#include <iris/type_list.hpp>

#include <type_traits>

Expand Down
2 changes: 1 addition & 1 deletion include/iris/alloy/detail/std_get.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <iris/config.hpp> // IWYU pragma: keep

#include <iris/type_traits.hpp>
#include <iris/type_list.hpp>

#include <utility>

Expand Down
2 changes: 1 addition & 1 deletion include/iris/alloy/detail/tuple_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <iris/alloy/traits.hpp>

#include <iris/type_traits.hpp>
#include <iris/type_list.hpp>

#include <type_traits>

Expand Down
4 changes: 2 additions & 2 deletions include/iris/alloy/traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

#include <iris/alloy/detail/deduce.hpp>

#include <iris/type_traits.hpp>
#include <iris/bits/specialization_of.hpp>

#include <functional>
#include <type_traits>

#include <cstddef>
#include <cstddef> // IWYU pragma: keep

namespace iris::alloy {

Expand Down
2 changes: 1 addition & 1 deletion include/iris/alloy/utility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <iris/alloy/tuple.hpp>

#include <iris/utility.hpp>
#include <iris/type_traits.hpp>
#include <iris/type_list.hpp>

#include <functional> // std::invoke
#include <type_traits>
Expand Down
3 changes: 2 additions & 1 deletion include/iris/hash.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#include <iris/config.hpp> // IWYU pragma: keep

#include <iris/requirements.hpp>
#include <iris/type_traits.hpp>
#include <iris/bits/specialization_of.hpp>
#include <iris/bits/is_function_object.hpp>

#include <functional>
#include <ranges>
Expand Down
86 changes: 43 additions & 43 deletions include/iris/rvariant/detail/variant_storage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

#include <iris/rvariant/detail/rvariant_fwd.hpp>

#include <iris/type_traits.hpp>
#include <iris/type_list.hpp>
#include <iris/bits/specialization_of.hpp>

#include <type_traits>
#include <utility>

#include <cstddef> // IWYU pragma: keep

Expand Down Expand Up @@ -79,7 +79,7 @@ template<class Variant, class T>
// => valueless iff move constructor throws
//
// Emplace (if VT(Args...) is throwing)
// rvariant tmp(std::in_place_index<I>, std::forward<Args>(args)...);
// rvariant tmp(std::in_place_index<I>, static_cast<Args&&>(args)...);
// *this = std::move(tmp);
// ^^^ needs to be NOT observable on user's part, as per "Effects" https://eel.is/c++draft/variant.mod#7
// ^^^^^^^^^^^^^^
Expand Down Expand Up @@ -193,7 +193,7 @@ IRIS_RVARIANT_ALWAYS_THROWING_UNREACHABLE_BEGIN
requires std::is_constructible_v<T, Args...> // required for not confusing some compilers
constexpr explicit variadic_union(std::in_place_index_t<0>, Args&&... args)
noexcept(std::is_nothrow_constructible_v<T, Args...>)
: first(std::forward<Args>(args)...) // value-initialize; https://eel.is/c++draft/variant.ctor#3
: first(static_cast<Args&&>(args)...) // value-initialize; https://eel.is/c++draft/variant.ctor#3
{}
IRIS_RVARIANT_ALWAYS_THROWING_UNREACHABLE_END

Expand All @@ -203,7 +203,7 @@ IRIS_RVARIANT_ALWAYS_THROWING_UNREACHABLE_END
std::is_constructible_v<IRIS_PACK_INDEXING(I - 1, Ts...), Args...>
constexpr explicit variadic_union(std::in_place_index_t<I>, Args&&... args)
noexcept(std::is_nothrow_constructible_v<IRIS_PACK_INDEXING(I - 1, Ts...), Args...>)
: rest(std::in_place_index<I - 1>, std::forward<Args>(args)...)
: rest(std::in_place_index<I - 1>, static_cast<Args&&>(args)...)
{}

union {
Expand Down Expand Up @@ -245,7 +245,7 @@ IRIS_RVARIANT_ALWAYS_THROWING_UNREACHABLE_BEGIN
requires std::is_constructible_v<T, Args...> // required for not confusing some compilers
constexpr explicit variadic_union(std::in_place_index_t<0>, Args&&... args)
noexcept(std::is_nothrow_constructible_v<T, Args...>)
: first(std::forward<Args>(args)...) // value-initialize; https://eel.is/c++draft/variant.ctor#3
: first(static_cast<Args&&>(args)...) // value-initialize; https://eel.is/c++draft/variant.ctor#3
{}
IRIS_RVARIANT_ALWAYS_THROWING_UNREACHABLE_END

Expand All @@ -255,7 +255,7 @@ IRIS_RVARIANT_ALWAYS_THROWING_UNREACHABLE_END
std::is_constructible_v<IRIS_PACK_INDEXING(I - 1, Ts...), Args...>
constexpr explicit variadic_union(std::in_place_index_t<I>, Args&&... args)
noexcept(std::is_nothrow_constructible_v<IRIS_PACK_INDEXING(I - 1, Ts...), Args...>)
: rest(std::in_place_index<I - 1>, std::forward<Args>(args)...)
: rest(std::in_place_index<I - 1>, static_cast<Args&&>(args)...)
{}

union {
Expand All @@ -281,56 +281,56 @@ template<class Variant>
[[nodiscard]] IRIS_FORCEINLINE constexpr forward_storage_t<Variant>&&
forward_storage(std::remove_reference_t<Variant>& v IRIS_LIFETIMEBOUND) noexcept
{
return std::forward<Variant>(v).storage();
return static_cast<Variant&&>(v).storage();
}

template<class Variant>
[[nodiscard]] IRIS_FORCEINLINE constexpr forward_storage_t<Variant>&&
forward_storage(std::remove_reference_t<Variant>&& v IRIS_LIFETIMEBOUND) noexcept // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
{
return std::forward<Variant>(v).storage();
return static_cast<Variant&&>(v).storage();
}


template<std::size_t I, class Storage>
[[nodiscard]] IRIS_FORCEINLINE constexpr auto&& raw_get(Storage&& storage IRIS_LIFETIMEBOUND) noexcept
{
if constexpr (I == 0) return std::forward<Storage>(storage).first;
else if constexpr (I == 1) return std::forward<Storage>(storage).rest.first;
else if constexpr (I == 2) return std::forward<Storage>(storage).rest.rest.first;
else if constexpr (I == 3) return std::forward<Storage>(storage).rest.rest.rest.first;
else if constexpr (I == 4) return std::forward<Storage>(storage).rest.rest.rest.rest.first;
else if constexpr (I == 5) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.first;
else if constexpr (I == 6) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 7) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 8) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 9) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 10) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 11) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 12) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 13) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 14) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 15) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 16) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 17) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 18) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 19) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 20) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 21) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 22) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 23) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 24) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 25) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 26) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 27) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 28) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 29) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 30) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 31) return std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
if constexpr (I == 0) return static_cast<Storage&&>(storage).first;
else if constexpr (I == 1) return static_cast<Storage&&>(storage).rest.first;
else if constexpr (I == 2) return static_cast<Storage&&>(storage).rest.rest.first;
else if constexpr (I == 3) return static_cast<Storage&&>(storage).rest.rest.rest.first;
else if constexpr (I == 4) return static_cast<Storage&&>(storage).rest.rest.rest.rest.first;
else if constexpr (I == 5) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.first;
else if constexpr (I == 6) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 7) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 8) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 9) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 10) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 11) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 12) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 13) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 14) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 15) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 16) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 17) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 18) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 19) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 20) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 21) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 22) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 23) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 24) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 25) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 26) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 27) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 28) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 29) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 30) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I == 31) return static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.first;
else if constexpr (I < 64) return detail::raw_get<I - 32>(
std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest);
static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest);
else return detail::raw_get<I - 64>(
std::forward<Storage>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest
static_cast<Storage&&>(storage).rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest
.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest.rest);
}

Expand Down
19 changes: 10 additions & 9 deletions include/iris/rvariant/detail/visit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <iris/rvariant/detail/variant_storage.hpp>
#include <iris/rvariant/variant_helper.hpp>

#include <iris/type_list.hpp>
#include <iris/type_traits.hpp>

#include <variant> // std::bad_variant_access
Expand Down Expand Up @@ -108,11 +109,11 @@ do_raw_visit(Visitor&& vis, Storage&& storage) // NOLINT(cppcoreguidelines-rval
noexcept(raw_visit_noexcept<I, Visitor, Storage>::value)
{
if constexpr (!std::remove_cvref_t<Storage>::never_valueless && I == 0) {
return std::forward<Visitor>(vis)(std::in_place_index<std::variant_npos>, std::forward<Storage>(storage));
return static_cast<Visitor&&>(vis)(std::in_place_index<std::variant_npos>, static_cast<Storage&&>(storage));

} else {
constexpr std::size_t RealI = valueless_unbias<Storage>(I);
return std::forward<Visitor>(vis)(std::in_place_index<RealI>, raw_get<RealI>(std::forward<Storage>(storage)));
return static_cast<Visitor&&>(vis)(std::in_place_index<RealI>, detail::raw_get<RealI>(static_cast<Storage&&>(storage)));
}
}

Expand Down Expand Up @@ -170,7 +171,7 @@ struct raw_visit_dispatch<NeverValueless, -1>
{
constexpr auto const& table = raw_visit_table<Visitor, Storage>::table;
auto const& f = table[i];
return f(std::forward<Visitor>(vis), std::forward<Storage>(storage));
return f(static_cast<Visitor&&>(vis), static_cast<Storage&&>(storage));
}
};

Expand Down Expand Up @@ -247,7 +248,7 @@ raw_visit(Variant&& v, Visitor&& vis) // NOLINT(cppcoreguidelines-missing-std-f
N, Visitor, forward_storage_t<Variant>
>(
detail::valueless_bias<Variant>(v.index_),
std::forward<Visitor>(vis),
static_cast<Visitor&&>(vis),
detail::forward_storage<Variant>(v)
);
}
Expand All @@ -262,7 +263,7 @@ raw_visit_i(std::size_t const biased_i, Variant&& v, Visitor&& vis) // NOLINT(c
N, Visitor, forward_storage_t<Variant>
>(
biased_i,
std::forward<Visitor>(vis),
static_cast<Visitor&&>(vis),
detail::forward_storage<Variant>(v)
);
}
Expand Down Expand Up @@ -415,9 +416,9 @@ struct multi_visitor<std::index_sequence<Is...>>

} else {
return std::invoke_r<R>(
std::forward<Visitor>(vis),
static_cast<Visitor&&>(vis),
unwrap_recursive(
raw_get<valueless_unbias<Storage>(Is)>(std::forward<Storage>(storage))
detail::raw_get<valueless_unbias<Storage>(Is)>(static_cast<Storage&&>(storage))
)...
);
}
Expand Down Expand Up @@ -455,7 +456,7 @@ struct visit_dispatch<-1>
{
constexpr auto const& table = visit_table<R, OverloadSeq, Visitor, Storage...>::table;
auto const& f = table[flat_i];
return f(std::forward<Visitor>(vis), std::forward<Storage>(storage)...);
return f(static_cast<Visitor&&>(vis), static_cast<Storage&&>(storage)...);
}
};

Expand Down Expand Up @@ -587,7 +588,7 @@ struct visit_impl<
return visit_dispatch<visit_strategy<OverloadSeq::size>>::template apply<
R, OverloadSeq, Visitor, forward_storage_t<as_variant_t<Variants>>...
>(
flat_i, std::forward<Visitor>(vis), forward_storage<as_variant_t<Variants>>(vars)...
flat_i, static_cast<Visitor&&>(vis), detail::forward_storage<as_variant_t<Variants>>(vars)...
);
}
};
Expand Down
6 changes: 4 additions & 2 deletions include/iris/rvariant/pack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

// Utilities related to [rvariant.pack]

#include <iris/type_traits.hpp>
#include <iris/type_list.hpp>

#include <type_traits>

namespace iris {

Expand All @@ -25,7 +27,7 @@ struct pack_union_impl<TT, type_list<Ts...>>
template<template<class...> class TT, class... Ts, class U, class... Us>
struct pack_union_impl<TT, type_list<Ts...>, U, Us...>
: std::conditional_t<
is_in_v<U, Ts...>,
is_in_v<U, Ts...>,
pack_union_impl<TT, type_list<Ts...>, Us...>,
pack_union_impl<TT, type_list<Ts..., U>, Us...>
>
Expand Down
Loading
Loading