Skip to content

Commit 490d45c

Browse files
committed
Try a bit more workarounds :(
1 parent c153e09 commit 490d45c

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
@@ -3980,14 +3980,24 @@ public:
39803980
#endif // __cpp_lib_concepts
39813981

39823982
template <class _Iter2, enable_if_t<_Range_verifiable_v<_Iter, _Iter2>, int> = 0>
3983-
friend constexpr void _Verify_range(const move_iterator& _First, const move_iterator<_Iter2>& _Last) noexcept(
3984-
noexcept(_Verify_range(_First._Current, _Last.base()))) {
3983+
friend constexpr void _Verify_range(const move_iterator& _First, const move_iterator<_Iter2>& _Last)
3984+
#ifdef __EDG__ // TRANSITION, VSO-1222776
3985+
noexcept(noexcept(_Verify_range(_STD declval<const _Iter&>(), _STD declval<const _Iter2&>())))
3986+
#else // ^^^ workaround / no workaround vvv
3987+
noexcept(noexcept(_Verify_range(_First._Current, _Last.base())))
3988+
#endif // TRANSITION, VSO-1222776
3989+
{
39853990
_Verify_range(_First._Current, _Last.base());
39863991
}
39873992
#ifdef __cpp_lib_concepts
39883993
template <sentinel_for<_Iter> _Sent, enable_if_t<_Range_verifiable_v<_Iter, _Sent>, int> = 0>
3989-
friend constexpr void _Verify_range(const move_iterator& _First, const move_sentinel<_Sent>& _Last) noexcept(
3990-
noexcept(_Verify_range(_First._Current, _Last._Get_last()))) {
3994+
friend constexpr void _Verify_range(const move_iterator& _First, const move_sentinel<_Sent>& _Last)
3995+
#ifdef __EDG__ // TRANSITION, VSO-1222776
3996+
noexcept(noexcept(_Verify_range(_STD declval<const _Iter&>(), _STD declval<const _Sent&>())))
3997+
#else // ^^^ workaround / no workaround vvv
3998+
noexcept(noexcept(_Verify_range(_First._Current, _Last._Get_last())))
3999+
#endif // TRANSITION, VSO-1222776
4000+
{
39914001
_Verify_range(_First._Current, _Last._Get_last());
39924002
}
39934003
#endif // __cpp_lib_concepts

0 commit comments

Comments
 (0)