Skip to content

Commit 5eea6a7

Browse files
misccostrega-nil
authored andcommitted
Try a bit more workarounds :(
1 parent f54de41 commit 5eea6a7

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

stl/inc/xutility

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3494,14 +3494,24 @@ public:
34943494
#endif // __cpp_lib_concepts
34953495

34963496
template <class _Iter2, enable_if_t<_Range_verifiable_v<_Iter, _Iter2>, int> = 0>
3497-
friend constexpr void _Verify_range(const move_iterator& _First, const move_iterator<_Iter2>& _Last) noexcept(
3498-
noexcept(_Verify_range(_First._Current, _Last.base()))) {
3497+
friend constexpr void _Verify_range(const move_iterator& _First, const move_iterator<_Iter2>& _Last)
3498+
#ifdef __EDG__ // TRANSITION, VSO-1222776
3499+
noexcept(noexcept(_Verify_range(_STD declval<const _Iter&>(), _STD declval<const _Iter2&>())))
3500+
#else // ^^^ workaround / no workaround vvv
3501+
noexcept(noexcept(_Verify_range(_First._Current, _Last.base())))
3502+
#endif // TRANSITION, VSO-1222776
3503+
{
34993504
_Verify_range(_First._Current, _Last.base());
35003505
}
35013506
#ifdef __cpp_lib_concepts
35023507
template <sentinel_for<_Iter> _Sent, enable_if_t<_Range_verifiable_v<_Iter, _Sent>, int> = 0>
3503-
friend constexpr void _Verify_range(const move_iterator& _First, const move_sentinel<_Sent>& _Last) noexcept(
3504-
noexcept(_Verify_range(_First._Current, _Last._Get_last()))) {
3508+
friend constexpr void _Verify_range(const move_iterator& _First, const move_sentinel<_Sent>& _Last)
3509+
#ifdef __EDG__ // TRANSITION, VSO-1222776
3510+
noexcept(noexcept(_Verify_range(_STD declval<const _Iter&>(), _STD declval<const _Sent&>())))
3511+
#else // ^^^ workaround / no workaround vvv
3512+
noexcept(noexcept(_Verify_range(_First._Current, _Last._Get_last())))
3513+
#endif // TRANSITION, VSO-1222776
3514+
{
35053515
_Verify_range(_First._Current, _Last._Get_last());
35063516
}
35073517
#endif // __cpp_lib_concepts

0 commit comments

Comments
 (0)