Skip to content

Remove MSVC-specific workarounds for references-to-functions #5661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2025
Merged

Remove MSVC-specific workarounds for references-to-functions #5661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions tests/std/tests/P0896R4_ranges_iterator_machinery/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,15 +1073,9 @@ namespace iterator_cust_move_test {
static_assert(noexcept(ranges::iter_move(static_cast<int const*>(&some_ints[2]))));

static_assert(same_as<iter_rvalue_reference_t<int[]>, int&&>);
#if defined(__clang__) || defined(__EDG__) // TRANSITION, VSO-1008447
#if defined(__clang__) || defined(__EDG__) // TRANSITION, VSO-1008447, VSO-2066340
static_assert(same_as<iter_rvalue_reference_t<int(int)>, int (&)(int)>);
#else // ^^^ no workaround / workaround vvv
#ifdef _MSVC_INTERNAL_TESTING // TRANSITION, assertion will fire once VSO-2066340 ships.
static_assert(same_as<iter_rvalue_reference_t<int(int)>, int (&&)(int)>);
#else // ^^^ defined(_MSVC_INTERNAL_TESTING) / !defined(_MSVC_INTERNAL_TESTING) vvv
static_assert(same_as<iter_rvalue_reference_t<int(int)>, int (*)(int)>);
#endif // ^^^ !defined(_MSVC_INTERNAL_TESTING)
#endif // ^^^ workaround ^^^
#endif // ^^^ no workaround ^^^

static_assert(same_as<iter_rvalue_reference_t<int[4]>, int&&>);
static_assert(ranges::iter_move(some_ints) == 0);
Expand All @@ -1092,9 +1086,7 @@ namespace iterator_cust_move_test {
}
#if defined(__clang__) || defined(__EDG__) // TRANSITION, VSO-1008447
static_assert(same_as<iter_rvalue_reference_t<int (*)(int)>, int (&)(int)>);
#else // ^^^ no workaround / workaround vvv
static_assert(same_as<iter_rvalue_reference_t<int (*)(int)>, int (&&)(int)>);
#endif // ^^^ workaround ^^^
#endif // ^^^ no workaround ^^^
static_assert(ranges::iter_move(&f)(42) == 43);
static_assert(noexcept(ranges::iter_move(&f)));

Expand Down