From 69f80a6ed26b7445ae2d68efd8a0a3f724926bdf Mon Sep 17 00:00:00 2001
From: Michael Schellenberger Costa <mschellenbergercosta@googlemail.com>
Date: Wed, 9 Jun 2021 11:07:32 +0200
Subject: [PATCH 1/2] Adopt LWG-3555

---
 stl/inc/ranges       | 12 ++++++------
 stl/inc/yvals_core.h |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/stl/inc/ranges b/stl/inc/ranges
index 7f50c4a62e3..e4348db1f3a 100644
--- a/stl/inc/ranges
+++ b/stl/inc/ranges
@@ -1407,9 +1407,9 @@ namespace ranges {
 #endif // _ITERATOR_DEBUG_LEVEL != 0
 
         public:
-            using iterator_concept = conditional_t<random_access_range<_Vw>, random_access_iterator_tag,
-                conditional_t<bidirectional_range<_Vw>, bidirectional_iterator_tag,
-                    conditional_t<forward_range<_Vw>, forward_iterator_tag, input_iterator_tag>>>;
+            using iterator_concept = conditional_t<random_access_range<_Base>, random_access_iterator_tag,
+                conditional_t<bidirectional_range<_Base>, bidirectional_iterator_tag,
+                    conditional_t<forward_range<_Base>, forward_iterator_tag, input_iterator_tag>>>;
             using value_type       = remove_cvref_t<invoke_result_t<_Fn&, range_reference_t<_Base>>>;
             using difference_type  = range_difference_t<_Base>;
 
@@ -3756,9 +3756,9 @@ namespace ranges {
             iterator_t<_Base> _Current{};
 
         public:
-            using iterator_concept = conditional_t<random_access_range<_Vw>, random_access_iterator_tag,
-                conditional_t<bidirectional_range<_Vw>, bidirectional_iterator_tag,
-                    conditional_t<forward_range<_Vw>, forward_iterator_tag, input_iterator_tag>>>;
+            using iterator_concept = conditional_t<random_access_range<_Base>, random_access_iterator_tag,
+                conditional_t<bidirectional_range<_Base>, bidirectional_iterator_tag,
+                    conditional_t<forward_range<_Base>, forward_iterator_tag, input_iterator_tag>>>;
             using value_type       = remove_cvref_t<tuple_element_t<_Index, range_value_t<_Base>>>;
             using difference_type  = range_difference_t<_Base>;
 
diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h
index 3b2c62061be..6c6602b71f0 100644
--- a/stl/inc/yvals_core.h
+++ b/stl/inc/yvals_core.h
@@ -249,6 +249,7 @@
 
 // _HAS_CXX20 indirectly controls:
 // P0619R4 Removing C++17-Deprecated Features
+// LWG-3555 view::iterator::iterator_concept should consider const-qualification of the underlying range
 
 // _HAS_CXX20 and _SILENCE_ALL_CXX20_DEPRECATION_WARNINGS control:
 // P0767R1 Deprecating is_pod

From 64258294f942f8f42d776d19d4cfae42effd6db3 Mon Sep 17 00:00:00 2001
From: Michael Schellenberger Costa <mschellenbergercosta@googlemail.com>
Date: Thu, 10 Jun 2021 13:57:32 +0200
Subject: [PATCH 2/2] Drop mentions in yvals_core.h

---
 stl/inc/yvals_core.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h
index 6c6602b71f0..3b2c62061be 100644
--- a/stl/inc/yvals_core.h
+++ b/stl/inc/yvals_core.h
@@ -249,7 +249,6 @@
 
 // _HAS_CXX20 indirectly controls:
 // P0619R4 Removing C++17-Deprecated Features
-// LWG-3555 view::iterator::iterator_concept should consider const-qualification of the underlying range
 
 // _HAS_CXX20 and _SILENCE_ALL_CXX20_DEPRECATION_WARNINGS control:
 // P0767R1 Deprecating is_pod