Skip to content

Commit 7141e98

Browse files
committed
Fix merge oops
1 parent a263452 commit 7141e98

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libcxx/include/optional

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ public:
951951
return std::move(this->__get());
952952
}
953953

954-
template <class _Up = remove_cv_t<_Tp> = remove_cv_t<_Tp>>
954+
template <class _Up = remove_cv_t<_Tp>>
955955
# if _LIBCPP_STD_VER >= 26
956956
requires(!(is_lvalue_reference_v<_Tp> && is_function_v<__libcpp_remove_reference_t<_Tp>>) &&
957957
!(is_lvalue_reference_v<_Tp> && is_array_v<__libcpp_remove_reference_t<_Tp>>))
@@ -962,7 +962,7 @@ public:
962962
return this->has_value() ? this->__get() : static_cast<value_type>(std::forward<_Up>(__v));
963963
}
964964

965-
template <class _Up = remove_cv_t<_Tp> = remove_cv_t<_Tp>>
965+
template <class _Up = remove_cv_t<_Tp>>
966966
# if _LIBCPP_STD_VER >= 26
967967
requires(!is_lvalue_reference_v<_Tp>)
968968
# endif

0 commit comments

Comments
 (0)