[gcc(refs/users/ppalka/heads/libstdcxx-constrained-algos-adaptors)] Fix some conformance issues

[Patrick Palka]

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

commit b8863ee1bc9f6eccc092ac1b72a38d6d8d204ee4
Author: Patrick Palka <ppalka@redhat.com>
Date:   Thu Feb 6 17:58:18 2020 -0500

    Fix some conformance issues

Diff:
---
 libstdc++-v3/include/std/ranges | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 7479f13..5f5786b 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -1493,7 +1493,7 @@ namespace views
 	  static constexpr auto
 	  _S_iter_cat()
 	  {
-	    using _Cat = iterator_traits<iterator_t<_Vp>>::iterator_category;
+	    using _Cat = iterator_traits<iterator_t<_Base>>::iterator_category;
 	    if constexpr (derived_from<_Cat, contiguous_iterator_tag>)
 	      return random_access_iterator_tag{};
 	    else
@@ -2899,7 +2899,8 @@ namespace views
 	if constexpr (random_access_iterator<_Iter>)
 	  return subrange{__i, __i + __n};
 	else
-	  return subrange{counted_iterator{__i, __n}, default_sentinel};
+	  return subrange{counted_iterator{std::move(__i), __n},
+			  default_sentinel};
       }
     };