Skip to content
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

Fixing eastl's variant. #1831

Merged
merged 1 commit into from
Jan 5, 2025
Merged

Fixing eastl's variant. #1831

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
6 changes: 3 additions & 3 deletions third_party/EASTL/include/EASTL/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,10 @@ namespace eastl
///////////////////////////////////////////////////////////////////////////
// 20.7.4, value access
//
template <class T, class... Types, ssize_t I = meta::get_type_index_v<T, Types...>>
template <class T, class... Types, EASTL_SSIZE_T I = meta::get_type_index_v<T, Types...>>
EA_CONSTEXPR bool holds_alternative(const variant<Types...>& v) EA_NOEXCEPT
{
// ssize_t template parameter because the value can be negative
// EASTL_SSIZE_T template parameter because the value can be negative
return I == variant_npos ? false : (v.index() == I);
}

Expand Down Expand Up @@ -858,7 +858,7 @@ namespace eastl
//
template <class T,
typename T_j = meta::overload_resolution_t<T, meta::overload_set<Types...>>,
ssize_t I = meta::get_type_index_v<decay_t<T_j>, Types...>,
EASTL_SSIZE_T I = meta::get_type_index_v<decay_t<T_j>, Types...>,
typename = enable_if_t<!eastl::is_same_v<decay_t<T>, variant> && eastl::is_assignable_v<T_j&, T> &&
eastl::is_constructible_v<T_j, T>>>
EA_CPP14_CONSTEXPR variant& operator=(T&& t)
Expand Down
Loading