Skip to content

Commit

Permalink
Merge pull request #1831 from nicolasnoble/eastl-variant-fix
Browse files Browse the repository at this point in the history
Fixing eastl's variant.
  • Loading branch information
nicolasnoble authored Jan 5, 2025
2 parents 0933dcd + bc4529d commit 2831e70
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions third_party/EASTL/include/EASTL/variant.h
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

0 comments on commit 2831e70

Please sign in to comment.