[gcc(refs/users/ppalka/heads/libstdcxx-constrained-algos)] Uglify a stray template parameter and remove unused headers

[Patrick Palka]

https://gcc.gnu.org/g:b8b44031671873e9a0f0d74f6f0326a07c33e6d6

commit b8b44031671873e9a0f0d74f6f0326a07c33e6d6
Author: Patrick Palka <ppalka@redhat.com>
Date:   Thu Jan 23 13:50:16 2020 -0500

    Uglify a stray template parameter and remove unused headers

Diff:
---
 libstdc++-v3/include/bits/ranges_algo.h                      | 12 ++++++------
 libstdc++-v3/testsuite/25_algorithms/reverse/constrained.cc  |  1 -
 .../testsuite/25_algorithms/unique_copy/constrained.cc       |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h
index bd5c583..72fcc5f 100644
--- a/libstdc++-v3/include/bits/ranges_algo.h
+++ b/libstdc++-v3/include/bits/ranges_algo.h
@@ -1910,10 +1910,10 @@ namespace ranges
 	}
     }
 
-  template<forward_range R>
-    requires permutable<iterator_t<R>>
-    constexpr safe_subrange_t<R>
-    rotate(R&& __r, iterator_t<R> __middle)
+  template<forward_range _Range>
+    requires permutable<iterator_t<_Range>>
+    constexpr safe_subrange_t<_Range>
+    rotate(_Range&& __r, iterator_t<_Range> __middle)
     {
       return ranges::rotate(ranges::begin(__r),
 			    std::move(__middle),
@@ -1923,11 +1923,11 @@ namespace ranges
   template<typename _Iter, typename _Out>
   using rotate_copy_result = copy_result<_Iter, _Out>;
 
-  template<forward_iterator _Iter, sentinel_for<_Iter> S,
+  template<forward_iterator _Iter, sentinel_for<_Iter> _Sent,
 	   weakly_incrementable _Out>
     requires indirectly_copyable<_Iter, _Out>
     constexpr rotate_copy_result<_Iter, _Out>
-    rotate_copy(_Iter __first, _Iter __middle, S __last, _Out __result)
+    rotate_copy(_Iter __first, _Iter __middle, _Sent __last, _Out __result)
     {
       auto __copy1 = ranges::copy(__middle,
 				  std::move(__last),
diff --git a/libstdc++-v3/testsuite/25_algorithms/reverse/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/reverse/constrained.cc
index da1bbc6..58cec27 100644
--- a/libstdc++-v3/testsuite/25_algorithms/reverse/constrained.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/reverse/constrained.cc
@@ -18,7 +18,6 @@
 // { dg-options "-std=gnu++2a" }
 // { dg-do run { target c++2a } }
 
-#include <list>
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique_copy/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/unique_copy/constrained.cc
index 2df0c85..bf16cdc 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique_copy/constrained.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique_copy/constrained.cc
@@ -18,7 +18,6 @@
 // { dg-options "-std=gnu++2a" }
 // { dg-do run { target c++2a } }
 
-#include <list>
 #include <algorithm>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>