Rename __is_foo_iterator traits to reflect their Cpp17 nature.

With the upcoming introduction of iterator concepts in ranges,
the meaning of "__is_contiguous_iterator" changes drastically.

Currently we intend it to mean "does it have this iterator category",
but it could now also mean "does it meet the requirements of this
concept", and these can be different.

1 files changed, 35 insertions, 35 deletions

diff --git a/libcxx/test/libcxx/iterators/trivial_iterators.pass.cpp b/libcxx/test/libcxx/iterators/trivial_iterators.pass.cpp
index 0618731ce75..3b16a78e47b 100644
--- a/libcxx/test/libcxx/iterators/trivial_iterators.pass.cpp
+++ b/libcxx/test/libcxx/iterators/trivial_iterators.pass.cpp
@@ -126,41 +126,41 @@ int main(int, char**)
 
 
 //  Iterator classification
-    static_assert(( std::__is_input_iterator        <char *>::value), "" );
-    static_assert(( std::__is_forward_iterator      <char *>::value), "" );
-    static_assert(( std::__is_bidirectional_iterator<char *>::value), "" );
-    static_assert(( std::__is_random_access_iterator<char *>::value), "" );
-    static_assert((!std::__is_exactly_input_iterator<char *>::value), "" );
-
-    static_assert(( std::__is_input_iterator        <input_iterator<char *> >::value), "" );
-    static_assert((!std::__is_forward_iterator      <input_iterator<char *> >::value), "" );
-    static_assert((!std::__is_bidirectional_iterator<input_iterator<char *> >::value), "" );
-    static_assert((!std::__is_random_access_iterator<input_iterator<char *> >::value), "" );
-    static_assert(( std::__is_exactly_input_iterator<input_iterator<char *> >::value), "" );
-
-    static_assert(( std::__is_input_iterator        <forward_iterator<char *> >::value), "" );
-    static_assert(( std::__is_forward_iterator      <forward_iterator<char *> >::value), "" );
-    static_assert((!std::__is_bidirectional_iterator<forward_iterator<char *> >::value), "" );
-    static_assert((!std::__is_random_access_iterator<forward_iterator<char *> >::value), "" );
-    static_assert((!std::__is_exactly_input_iterator<forward_iterator<char *> >::value), "" );
-
-    static_assert(( std::__is_input_iterator        <bidirectional_iterator<char *> >::value), "" );
-    static_assert(( std::__is_forward_iterator      <bidirectional_iterator<char *> >::value), "" );
-    static_assert(( std::__is_bidirectional_iterator<bidirectional_iterator<char *> >::value), "" );
-    static_assert((!std::__is_random_access_iterator<bidirectional_iterator<char *> >::value), "" );
-    static_assert((!std::__is_exactly_input_iterator<bidirectional_iterator<char *> >::value), "" );
-
-    static_assert(( std::__is_input_iterator        <random_access_iterator<char *> >::value), "" );
-    static_assert(( std::__is_forward_iterator      <random_access_iterator<char *> >::value), "" );
-    static_assert(( std::__is_bidirectional_iterator<random_access_iterator<char *> >::value), "" );
-    static_assert(( std::__is_random_access_iterator<random_access_iterator<char *> >::value), "" );
-    static_assert((!std::__is_exactly_input_iterator<random_access_iterator<char *> >::value), "" );
-
-    static_assert(( std::__is_input_iterator        <my_input_iterator<char *> >::value), "" );
-    static_assert((!std::__is_forward_iterator      <my_input_iterator<char *> >::value), "" );
-    static_assert((!std::__is_bidirectional_iterator<my_input_iterator<char *> >::value), "" );
-    static_assert((!std::__is_random_access_iterator<my_input_iterator<char *> >::value), "" );
-    static_assert(( std::__is_exactly_input_iterator<my_input_iterator<char *> >::value), "" );
+    static_assert(( std::__is_cpp17_input_iterator        <char *>::value), "" );
+    static_assert(( std::__is_cpp17_forward_iterator      <char *>::value), "" );
+    static_assert(( std::__is_cpp17_bidirectional_iterator<char *>::value), "" );
+    static_assert(( std::__is_cpp17_random_access_iterator<char *>::value), "" );
+    static_assert((!std::__is_exactly_cpp17_input_iterator<char *>::value), "" );
+
+    static_assert(( std::__is_cpp17_input_iterator        <input_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_forward_iterator      <input_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_bidirectional_iterator<input_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_random_access_iterator<input_iterator<char *> >::value), "" );
+    static_assert(( std::__is_exactly_cpp17_input_iterator<input_iterator<char *> >::value), "" );
+
+    static_assert(( std::__is_cpp17_input_iterator        <forward_iterator<char *> >::value), "" );
+    static_assert(( std::__is_cpp17_forward_iterator      <forward_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_bidirectional_iterator<forward_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_random_access_iterator<forward_iterator<char *> >::value), "" );
+    static_assert((!std::__is_exactly_cpp17_input_iterator<forward_iterator<char *> >::value), "" );
+
+    static_assert(( std::__is_cpp17_input_iterator        <bidirectional_iterator<char *> >::value), "" );
+    static_assert(( std::__is_cpp17_forward_iterator      <bidirectional_iterator<char *> >::value), "" );
+    static_assert(( std::__is_cpp17_bidirectional_iterator<bidirectional_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_random_access_iterator<bidirectional_iterator<char *> >::value), "" );
+    static_assert((!std::__is_exactly_cpp17_input_iterator<bidirectional_iterator<char *> >::value), "" );
+
+    static_assert(( std::__is_cpp17_input_iterator        <random_access_iterator<char *> >::value), "" );
+    static_assert(( std::__is_cpp17_forward_iterator      <random_access_iterator<char *> >::value), "" );
+    static_assert(( std::__is_cpp17_bidirectional_iterator<random_access_iterator<char *> >::value), "" );
+    static_assert(( std::__is_cpp17_random_access_iterator<random_access_iterator<char *> >::value), "" );
+    static_assert((!std::__is_exactly_cpp17_input_iterator<random_access_iterator<char *> >::value), "" );
+
+    static_assert(( std::__is_cpp17_input_iterator        <my_input_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_forward_iterator      <my_input_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_bidirectional_iterator<my_input_iterator<char *> >::value), "" );
+    static_assert((!std::__is_cpp17_random_access_iterator<my_input_iterator<char *> >::value), "" );
+    static_assert(( std::__is_exactly_cpp17_input_iterator<my_input_iterator<char *> >::value), "" );
 
 //
 //  iterators from libc++'s containers