Skip to content

Commit 2831e70

Browse files
authored
Merge pull request #1831 from nicolasnoble/eastl-variant-fix
Fixing eastl's variant.
2 parents 0933dcd + bc4529d commit 2831e70

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

third_party/EASTL/include/EASTL/variant.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,10 +637,10 @@ namespace eastl
637637
///////////////////////////////////////////////////////////////////////////
638638
// 20.7.4, value access
639639
//
640-
template <class T, class... Types, ssize_t I = meta::get_type_index_v<T, Types...>>
640+
template <class T, class... Types, EASTL_SSIZE_T I = meta::get_type_index_v<T, Types...>>
641641
EA_CONSTEXPR bool holds_alternative(const variant<Types...>& v) EA_NOEXCEPT
642642
{
643-
// ssize_t template parameter because the value can be negative
643+
// EASTL_SSIZE_T template parameter because the value can be negative
644644
return I == variant_npos ? false : (v.index() == I);
645645
}
646646

@@ -858,7 +858,7 @@ namespace eastl
858858
//
859859
template <class T,
860860
typename T_j = meta::overload_resolution_t<T, meta::overload_set<Types...>>,
861-
ssize_t I = meta::get_type_index_v<decay_t<T_j>, Types...>,
861+
EASTL_SSIZE_T I = meta::get_type_index_v<decay_t<T_j>, Types...>,
862862
typename = enable_if_t<!eastl::is_same_v<decay_t<T>, variant> && eastl::is_assignable_v<T_j&, T> &&
863863
eastl::is_constructible_v<T_j, T>>>
864864
EA_CPP14_CONSTEXPR variant& operator=(T&& t)

0 commit comments

Comments
 (0)