From 7f762d322448622a2bc2b602b77336e90fd2165f Mon Sep 17 00:00:00 2001
From: Casey Carter <cacarter@microsoft.com>
Date: Mon, 2 Nov 2020 12:55:04 -0800
Subject: [PATCH] Always remove_cvref_t the argument to enable_borrowed_range

... especially in these view tests.
---
 tests/std/tests/P0896R4_views_all/test.cpp     | 4 ++--
 tests/std/tests/P0896R4_views_reverse/test.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/std/tests/P0896R4_views_all/test.cpp b/tests/std/tests/P0896R4_views_all/test.cpp
index 0fdad26b8f5..c2450d1e47d 100644
--- a/tests/std/tests/P0896R4_views_all/test.cpp
+++ b/tests/std/tests/P0896R4_views_all/test.cpp
@@ -95,7 +95,7 @@ constexpr bool test_one(Rng&& rng) {
 
         static_assert(same_as<decltype(move(rng) | pipeline), V>);
         static_assert(noexcept(move(rng) | pipeline) == is_noexcept);
-    } else if constexpr (ranges::enable_borrowed_range<Rng>) {
+    } else if constexpr (ranges::enable_borrowed_range<remove_cvref_t<Rng>>) {
         using S                    = decltype(ranges::subrange{declval<Rng>()});
         constexpr bool is_noexcept = noexcept(S{declval<Rng>()});
 
@@ -131,7 +131,7 @@ constexpr bool test_one(Rng&& rng) {
 
         static_assert(same_as<decltype(move(as_const(rng)) | pipeline), V>);
         static_assert(noexcept(move(as_const(rng)) | pipeline) == is_noexcept);
-    } else if constexpr (!is_view && ranges::enable_borrowed_range<const remove_cvref_t<Rng>>) {
+    } else if constexpr (!is_view && ranges::enable_borrowed_range<remove_cvref_t<Rng>>) {
         using S                    = decltype(ranges::subrange{declval<const remove_cvref_t<Rng>>()});
         constexpr bool is_noexcept = noexcept(S{declval<const remove_cvref_t<Rng>>()});
 
diff --git a/tests/std/tests/P0896R4_views_reverse/test.cpp b/tests/std/tests/P0896R4_views_reverse/test.cpp
index 56e1dd474f6..f1a41979340 100644
--- a/tests/std/tests/P0896R4_views_reverse/test.cpp
+++ b/tests/std/tests/P0896R4_views_reverse/test.cpp
@@ -106,7 +106,7 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
 
         static_assert(same_as<decltype(move(rng) | pipeline), R>);
         static_assert(noexcept(move(rng) | pipeline) == is_noexcept);
-    } else if constexpr (enable_borrowed_range<Rng>) {
+    } else if constexpr (enable_borrowed_range<remove_cvref_t<Rng>>) {
         using S                    = decltype(ranges::subrange{declval<Rng>()});
         using RS                   = reverse_view<S>;
         constexpr bool is_noexcept = noexcept(S{declval<Rng>()});
@@ -141,7 +141,7 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
 
         static_assert(same_as<decltype(move(as_const(rng)) | pipeline), R>);
         static_assert(noexcept(move(as_const(rng)) | pipeline) == is_noexcept);
-    } else if constexpr (!is_view && enable_borrowed_range<const remove_cvref_t<Rng>>) {
+    } else if constexpr (!is_view && enable_borrowed_range<remove_cvref_t<Rng>>) {
         using S                    = decltype(ranges::subrange{declval<const remove_cvref_t<Rng>>()});
         using RS                   = reverse_view<S>;
         constexpr bool is_noexcept = noexcept(S{declval<const remove_cvref_t<Rng>>()});