stl_algobase.h (struct __miter_base): Add.

2007-10-27  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_algobase.h (struct __miter_base): Add.
	(__copy_move_a2, __copy_move_backward_a2): Add.
	(copy, copy_backward, move, move_backward): Adjust, call *a2 helpers.
	* include/bits/cpp_type_traits.h (struct __is_move_iterator): Add.
	* include/bits/streambuf_iterator.h (__copy_move_a<>): Rename
	to __copy_move_a2.
	* include/std/streambuf (friend __copy_move_a<>): Likewise.
	* testsuite/25_algorithms/copy/move_iterators/1.cc: New.
	* testsuite/25_algorithms/copy_backward/move_iterators/1.cc: Likewise.

	* include/bits/stl_iterator.h (__normal_iterator<>::_Iterator_type):
	Rename to iterator_type.

From-SVN: r129678

libstdc++-v3/ChangeLog

+2007-10-27  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_algobase.h (struct __miter_base): Add.
+	(__copy_move_a2, __copy_move_backward_a2): Add.
+	(copy, copy_backward, move, move_backward): Adjust, call *a2 helpers.
+	* include/bits/cpp_type_traits.h (struct __is_move_iterator): Add.
+	* include/bits/streambuf_iterator.h (__copy_move_a<>): Rename
+	to __copy_move_a2.
+	* include/std/streambuf (friend __copy_move_a<>): Likewise.
+	* testsuite/25_algorithms/copy/move_iterators/1.cc: New.
+	* testsuite/25_algorithms/copy_backward/move_iterators/1.cc: Likewise.
+
+	* include/bits/stl_iterator.h (__normal_iterator<>::_Iterator_type):
+	Rename to iterator_type.
+
 2007-10-26  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/ext/throw_allocator.h (throw_allocator<>::

libstdc++-v3/include/bits/cpp_type_traits.h

@@ -381,6 +381,28 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       typedef __true_type __type;
     };
 
+  //
+  // Move iterator type
+  //
+  template<typename _Tp>
+    struct __is_move_iterator
+    {
+      enum { __value = 0 };
+      typedef __false_type __type;
+    };
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+  template<typename _Iterator>
+    class move_iterator;
+
+  template<typename _Iterator>
+    struct __is_move_iterator< move_iterator<_Iterator> >
+    {
+      enum { __value = 1 };
+      typedef __true_type __type;
+    };
+#endif
+
 _GLIBCXX_END_NAMESPACE
 
 #endif //_CPP_TYPE_TRAITS_H

libstdc++-v3/include/bits/stl_iterator.h

@@ -668,6 +668,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       _Iterator _M_current;
 
     public:
+      typedef _Iterator					     iterator_type;
       typedef typename iterator_traits<_Iterator>::iterator_category
                                                              iterator_category;
       typedef typename iterator_traits<_Iterator>::value_type  value_type;
@@ -676,8 +677,6 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       typedef typename iterator_traits<_Iterator>::reference reference;
       typedef typename iterator_traits<_Iterator>::pointer   pointer;
 
-      typedef _Iterator _Iterator_type;
-
       __normal_iterator() : _M_current(_Iterator()) { }
 
       explicit

libstdc++-v3/include/bits/streambuf_iterator.h

@@ -68,10 +68,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	copy(istreambuf_iterator<_CharT2>, istreambuf_iterator<_CharT2>,
 	     ostreambuf_iterator<_CharT2>);
 
-      template<bool _IsCopy, typename _CharT2>
+      template<bool _IsMove, typename _CharT2>
 	friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, 
 					       _CharT2*>::__type
-	__copy_move_a(istreambuf_iterator<_CharT2>,
+	__copy_move_a2(istreambuf_iterator<_CharT2>,
 		       istreambuf_iterator<_CharT2>, _CharT2*);
 
       template<typename _CharT2>
@@ -292,10 +292,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       return __result;
     }
 
-  template<bool _IsCopy, typename _CharT>
+  template<bool _IsMove, typename _CharT>
     typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, 
     				    ostreambuf_iterator<_CharT> >::__type
-    __copy_move_a(_CharT* __first, _CharT* __last,
+    __copy_move_a2(_CharT* __first, _CharT* __last,
 		   ostreambuf_iterator<_CharT> __result)
     {
       const streamsize __num = __last - __first;
@@ -304,10 +304,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       return __result;
     }
 
-  template<bool _IsCopy, typename _CharT>
+  template<bool _IsMove, typename _CharT>
     typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
 				    ostreambuf_iterator<_CharT> >::__type
-    __copy_move_a(const _CharT* __first, const _CharT* __last,
+    __copy_move_a2(const _CharT* __first, const _CharT* __last,
 		   ostreambuf_iterator<_CharT> __result)
     {
       const streamsize __num = __last - __first;
@@ -316,10 +316,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       return __result;
     }
 
-  template<bool _IsCopy, typename _CharT>
+  template<bool _IsMove, typename _CharT>
     typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, 
     				    _CharT*>::__type
-    __copy_move_a(istreambuf_iterator<_CharT> __first,
+    __copy_move_a2(istreambuf_iterator<_CharT> __first,
 		   istreambuf_iterator<_CharT> __last, _CharT* __result)
     {
       typedef istreambuf_iterator<_CharT>                  __is_iterator_type;

libstdc++-v3/include/std/streambuf

@@ -155,10 +155,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       friend streamsize
       __copy_streambufs_eof<>(__streambuf_type*, __streambuf_type*, bool&);
 
-      template<bool _IsCopy, typename _CharT2>
+      template<bool _IsMove, typename _CharT2>
         friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, 
 					       _CharT2*>::__type
-        __copy_move_a(istreambuf_iterator<_CharT2>,
+        __copy_move_a2(istreambuf_iterator<_CharT2>,
 		       istreambuf_iterator<_CharT2>, _CharT2*);
 
       template<typename _CharT2>

libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc

+// { dg-options "-std=gnu++0x" }
+
+// Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without Pred the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+#undef _GLIBCXX_CONCEPT_CHECKS
+#define  _GLIBCXX_TESTSUITE_ALLOW_RVALREF_ALIASING
+
+#include <algorithm>
+#include <iterator>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_rvalref.h>
+
+using __gnu_test::test_container;
+using __gnu_test::input_iterator_wrapper;
+using __gnu_test::output_iterator_wrapper;
+using __gnu_test::rvalstruct;
+using std::copy;
+
+typedef test_container<rvalstruct, input_iterator_wrapper> container_in;
+typedef test_container<rvalstruct, output_iterator_wrapper> container_out;
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  int inarray[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+  const int size = sizeof(inarray) / sizeof(int);
+
+  rvalstruct in[size], out[size];
+  std::copy(inarray, inarray + size, in);
+
+  container_in incon(in, in + size);
+  container_out outcon(out, out + size);
+
+  copy(std::move_iterator<input_iterator_wrapper<rvalstruct> >(incon.begin()),
+       std::move_iterator<input_iterator_wrapper<rvalstruct> >(incon.end()),
+       outcon.begin());
+  VERIFY( std::equal(out, out + size, inarray) );
+  for (int z = 0; z < size; ++z)
+    VERIFY( out[z].valid );
+  for (int z = 0; z < size; ++z)
+    VERIFY( !in[z].valid );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}

libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc

+// { dg-options "-std=gnu++0x" }
+
+// Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without Pred the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+#undef _GLIBCXX_CONCEPT_CHECKS
+#define  _GLIBCXX_TESTSUITE_ALLOW_RVALREF_ALIASING
+
+#include <algorithm>
+#include <iterator>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_rvalref.h>
+
+using __gnu_test::test_container;
+using __gnu_test::bidirectional_iterator_wrapper;
+using __gnu_test::rvalstruct;
+using std::copy_backward;
+
+typedef test_container<rvalstruct,
+		       bidirectional_iterator_wrapper> container_in;
+typedef test_container<rvalstruct,
+		       bidirectional_iterator_wrapper> container_out;
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  int inarray[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+  const int size = sizeof(inarray) / sizeof(int);
+
+  rvalstruct in[size], out[size];
+  std::copy(inarray, inarray + size, in);
+  std::fill(out, out + size, 0);
+
+  container_in incon(in, in + size);
+  container_out outcon(out, out + size);
+
+  copy_backward(std::move_iterator<bidirectional_iterator_wrapper<rvalstruct> >(incon.begin()),
+		std::move_iterator<bidirectional_iterator_wrapper<rvalstruct> >(incon.end()),
+		outcon.end());
+  VERIFY( std::equal(out, out + size, inarray) );
+  for (int z = 0; z < size; ++z)
+    VERIFY( out[z].valid );
+  for (int z = 0; z < size; ++z)
+    VERIFY( !in[z].valid );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}