Commit 9d509587 authored by Ruslan Arutyunyan's avatar Ruslan Arutyunyan Committed by Louis Dionne
Browse files

[libc++] Fix build after 51faba35 

Differential Revision: https://reviews.llvm.org/D95372
parent 988a5334

libcxx/include/variant

+4 −6
Original line number Diff line number Diff line
@@ -1635,10 +1635,10 @@ constexpr bool operator>=(const variant<_Types...>& __lhs, 
      __lhs.index(), __convert_to_bool<greater_equal<>>{}, __lhs, __rhs);

}



template <class _Visitor, class... _Vs>

template <class... _Vs>

inline _LIBCPP_INLINE_VISIBILITY

_LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS

constexpr void __throw_if_valueless(_Visitor&& __visitor, _Vs&&... __vs) {

constexpr void __throw_if_valueless(_Vs&&... __vs) {

  const bool __valueless = (... || __vs.valueless_by_exception());

  if (__valueless) {

      __throw_bad_variant_access();
@@ -1650,8 +1650,7 @@ inline _LIBCPP_INLINE_VISIBILITY 
_LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS

constexpr decltype(auto) visit(_Visitor&& __visitor, _Vs&&... __vs) {

  using __variant_detail::__visitation::__variant;

  _VSTD::__throw_if_valueless(_VSTD::forward<_Visitor>(__visitor),

                              _VSTD::forward<_Vs>(__vs)...);

  _VSTD::__throw_if_valueless(_VSTD::forward<_Vs>(__vs)...);

  return __variant::__visit_value(_VSTD::forward<_Visitor>(__visitor),

                                  _VSTD::forward<_Vs>(__vs)...);

}
@@ -1662,8 +1661,7 @@ inline _LIBCPP_INLINE_VISIBILITY 
_LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS

constexpr _Rp visit(_Visitor&& __visitor, _Vs&&... __vs) {

  using __variant_detail::__visitation::__variant;

  _VSTD::__throw_if_valueless(_VSTD::forward<_Visitor>(__visitor),

                              _VSTD::forward<_Vs>(__vs)...);

  _VSTD::__throw_if_valueless(_VSTD::forward<_Vs>(__vs)...);

  return __variant::__visit_value<_Rp>(_VSTD::forward<_Visitor>(__visitor),

                                       _VSTD::forward<_Vs>(__vs)...);

}