stl_deque.h (deque<>::push_back<>(_Args...), [...]): Add.

2007-11-12  Chris Jefferson  <chris@bubblescope.net>
	    Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_deque.h (deque<>::push_back<>(_Args...),
	deque<>::push_front<>(_Args...), emplace<>(iterator, _Args...),
	insert(iterator, _Tp&&), _M_push_back_aux<>(_Args&&...),
	_M_push_front_aux<>(_Args&&...), _M_insert_aux<>(iterator,
	_Args&&...)): Add.
	* include/deque/deque.tcc (insert(iterator, value_type&&),
	emplace<>(iterator, _Args...), _M_push_back_aux<>(_Args&&...),
	_M_push_front_aux<>(_Args&&...), _M_insert_aux<>(iterator,
	_Args&&...)): Define.
	(_M_insert_aux(iterator, size_type, const value_type&),
	_M_insert_aux<>(iterator, _ForwardIterator, _ForwardIterator,
	size_type)): Use _GLIBCXX_MOVE3, _GLIBCXX_MOVE_BACKWARD3,
	__uninitialized_move*, __uninitialized_fill_move,
	__uninitialized_copy_move, when possible.
	* include/bits/stl_uninitialized.h (__uninitialized_copy_copy,
	__uninitialized_fill_copy, __uninitialized_copy_fill): Remove.
	(__uninitialized_copy_move, __uninitialized_move_copy,
	__uninitialized_move_fill, __uninitialized_fill_move): Add.
	* include/debug/deque (deque<>::push_back<>(_Args...),
	deque<>::push_front<>(_Args...), emplace<>(iterator, _Args...),
	insert(iterator, _Tp&&)): Add.
	* testsuite/23_containers/deque/modifiers/moveable.cc: Enable.
	* testsuite/23_containers/deque/capacity/moveable.cc: Likewise.
	* testsuite/23_containers/deque/cons/moveable.cc: Likewise.
	* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
	Adjust dg-error line numbers.
	* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
	Likewise.
	* testsuite/23_containers/deque/requirements/dr438/
	constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/deque/requirements/dr438/
	constructor_2_neg.cc: Likewise.

	* include/debug/vector (vector<>::insert(iterator, _Tp&&)): Minor
	tweak, prefer std::move.

Co-Authored-By: Paolo Carlini <pcarlini@suse.de>

From-SVN: r130102

libstdc++-v3/ChangeLog

+2007-11-12  Chris Jefferson  <chris@bubblescope.net>
+	    Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_deque.h (deque<>::push_back<>(_Args...),
+	deque<>::push_front<>(_Args...), emplace<>(iterator, _Args...),
+	insert(iterator, _Tp&&), _M_push_back_aux<>(_Args&&...),
+	_M_push_front_aux<>(_Args&&...), _M_insert_aux<>(iterator,
+	_Args&&...)): Add.
+	* include/deque/deque.tcc (insert(iterator, value_type&&),
+	emplace<>(iterator, _Args...), _M_push_back_aux<>(_Args&&...),
+	_M_push_front_aux<>(_Args&&...), _M_insert_aux<>(iterator,
+	_Args&&...)): Define.
+	(_M_insert_aux(iterator, size_type, const value_type&),
+	_M_insert_aux<>(iterator, _ForwardIterator, _ForwardIterator,
+	size_type)): Use _GLIBCXX_MOVE3, _GLIBCXX_MOVE_BACKWARD3,
+	__uninitialized_move*, __uninitialized_fill_move,
+	__uninitialized_copy_move, when possible.
+	* include/bits/stl_uninitialized.h (__uninitialized_copy_copy,
+	__uninitialized_fill_copy, __uninitialized_copy_fill): Remove.
+	(__uninitialized_copy_move, __uninitialized_move_copy,
+	__uninitialized_move_fill, __uninitialized_fill_move): Add.
+	* include/debug/deque (deque<>::push_back<>(_Args...),
+	deque<>::push_front<>(_Args...), emplace<>(iterator, _Args...),
+	insert(iterator, _Tp&&)): Add.
+	* testsuite/23_containers/deque/modifiers/moveable.cc: Enable.
+	* testsuite/23_containers/deque/capacity/moveable.cc: Likewise.
+	* testsuite/23_containers/deque/cons/moveable.cc: Likewise.
+	* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
+	Adjust dg-error line numbers.
+	* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
+	Likewise.
+	* testsuite/23_containers/deque/requirements/dr438/
+	constructor_1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/requirements/dr438/
+	constructor_2_neg.cc: Likewise.
+
+	* include/debug/vector (vector<>::insert(iterator, _Tp&&)): Minor
+	tweak, prefer std::move.
+
 2007-11-11  Howard Hinnant  <hhinnant@apple.com>
 
 	* include/bits/stl_pair.h (pair<>::pair<>(_U1&&, _Arg0&&,

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

@@ -1129,6 +1129,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
        *  data to it.  Due to the nature of a %deque this operation
        *  can be done in constant time.
        */
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
       void
       push_front(const value_type& __x)
       {
@@ -1140,6 +1141,21 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
 	else
 	  _M_push_front_aux(__x);
       }
+#else
+      template<typename... _Args>
+        void
+        push_front(_Args&&... __args)
+	{
+	  if (this->_M_impl._M_start._M_cur != this->_M_impl._M_start._M_first)
+	    {
+	      this->_M_impl.construct(this->_M_impl._M_start._M_cur - 1,
+				      std::forward<_Args>(__args)...);
+	      --this->_M_impl._M_start._M_cur;
+	    }
+	  else
+	    _M_push_front_aux(std::forward<_Args>(__args)...);
+	}
+#endif
 
       /**
        *  @brief  Add data to the end of the %deque.
@@ -1150,6 +1166,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
        *  to it.  Due to the nature of a %deque this operation can be
        *  done in constant time.
        */
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
       void
       push_back(const value_type& __x)
       {
@@ -1162,6 +1179,22 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
 	else
 	  _M_push_back_aux(__x);
       }
+#else
+      template<typename... _Args>
+        void
+        push_back(_Args&&... __args)
+	{
+	  if (this->_M_impl._M_finish._M_cur
+	      != this->_M_impl._M_finish._M_last - 1)
+	    {
+	      this->_M_impl.construct(this->_M_impl._M_finish._M_cur,
+				      std::forward<_Args>(__args)...);
+	      ++this->_M_impl._M_finish._M_cur;
+	    }
+	  else
+	    _M_push_back_aux(std::forward<_Args>(__args)...);
+	}
+#endif
 
       /**
        *  @brief  Removes first element.
@@ -1205,6 +1238,21 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
 	  _M_pop_back_aux();
       }
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+      /**
+       *  @brief  Inserts an object in %deque before specified iterator.
+       *  @param  position  An iterator into the %deque.
+       *  @param  args  Arguments.
+       *  @return  An iterator that points to the inserted data.
+       *
+       *  This function will insert an object of type T constructed
+       *  with T(std::forward<Args>(args)...) before the specified location.
+       */
+      template<typename... _Args>
+        iterator
+        emplace(iterator __position, _Args&&... __args);
+#endif
+
       /**
        *  @brief  Inserts given value into %deque before specified iterator.
        *  @param  position  An iterator into the %deque.
@@ -1217,6 +1265,20 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       iterator
       insert(iterator __position, const value_type& __x);
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+      /**
+       *  @brief  Inserts given rvalue into %deque before specified iterator.
+       *  @param  position  An iterator into the %deque.
+       *  @param  x  Data to be inserted.
+       *  @return  An iterator that points to the inserted data.
+       *
+       *  This function will insert a copy of the given rvalue before the
+       *  specified location.
+       */
+      iterator
+      insert(iterator __position, value_type&& __x);
+#endif
+
       /**
        *  @brief  Inserts a number of copies of given data into the %deque.
        *  @param  position  An iterator into the %deque.
@@ -1459,9 +1521,17 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
        *  @brief Helper functions for push_* and pop_*.
        *  @endif
        */
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
       void _M_push_back_aux(const value_type&);
 
       void _M_push_front_aux(const value_type&);
+#else
+      template<typename... _Args>
+        void _M_push_back_aux(_Args&&... __args);
+
+      template<typename... _Args>
+        void _M_push_front_aux(_Args&&... __args);
+#endif
 
       void _M_pop_back_aux();
 
@@ -1512,8 +1582,14 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       _M_fill_insert(iterator __pos, size_type __n, const value_type& __x);
 
       // called by insert(p,x)
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
       iterator
       _M_insert_aux(iterator __pos, const value_type& __x);
+#else
+      template<typename... _Args>
+        iterator
+        _M_insert_aux(iterator __pos, _Args&&... __args);
+#endif
 
       // called by insert(p,n,x) via fill_insert
       void

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

@@ -323,19 +323,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     { std::uninitialized_fill_n(__first, __n, __x); }
 
 
-  // Extensions: __uninitialized_copy_copy, __uninitialized_copy_fill,
-  // __uninitialized_fill_copy.  All of these algorithms take a user-
-  // supplied allocator, which is used for construction and destruction.
+  // Extensions: __uninitialized_copy_move, __uninitialized_move_copy,
+  // __uninitialized_fill_move, __uninitialized_move_fill.
+  // All of these algorithms take a user-supplied allocator, which is used
+  // for construction and destruction.
 
-  // __uninitialized_copy_copy
+  // __uninitialized_copy_move
   // Copies [first1, last1) into [result, result + (last1 - first1)), and
-  //  copies [first2, last2) into
+  //  move [first2, last2) into
   //  [result, result + (last1 - first1) + (last2 - first2)).
-
   template<typename _InputIterator1, typename _InputIterator2,
 	   typename _ForwardIterator, typename _Allocator>
     inline _ForwardIterator
-    __uninitialized_copy_copy(_InputIterator1 __first1,
+    __uninitialized_copy_move(_InputIterator1 __first1,
 			      _InputIterator1 __last1,
 			      _InputIterator2 __first2,
 			      _InputIterator2 __last2,
@@ -347,7 +347,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 							   __alloc);
       try
 	{
-	  return std::__uninitialized_copy_a(__first2, __last2, __mid, __alloc);
+	  return std::__uninitialized_move_a(__first2, __last2, __mid, __alloc);
 	}
       catch(...)
 	{
@@ -356,20 +356,48 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	}
     }
 
-  // __uninitialized_fill_copy
-  // Fills [result, mid) with x, and copies [first, last) into
+  // __uninitialized_move_copy
+  // Moves [first1, last1) into [result, result + (last1 - first1)), and
+  //  copies [first2, last2) into
+  //  [result, result + (last1 - first1) + (last2 - first2)).
+  template<typename _InputIterator1, typename _InputIterator2,
+	   typename _ForwardIterator, typename _Allocator>
+    inline _ForwardIterator
+    __uninitialized_move_copy(_InputIterator1 __first1,
+			      _InputIterator1 __last1,
+			      _InputIterator2 __first2,
+			      _InputIterator2 __last2,
+			      _ForwardIterator __result,
+			      _Allocator& __alloc)
+    {
+      _ForwardIterator __mid = std::__uninitialized_move_a(__first1, __last1,
+							   __result,
+							   __alloc);
+      try
+	{
+	  return std::__uninitialized_copy_a(__first2, __last2, __mid, __alloc);
+	}
+      catch(...)
+	{
+	  std::_Destroy(__result, __mid, __alloc);
+	  __throw_exception_again;
+	}
+    }
+  
+  // __uninitialized_fill_move
+  // Fills [result, mid) with x, and moves [first, last) into
   //  [mid, mid + (last - first)).
   template<typename _ForwardIterator, typename _Tp, typename _InputIterator,
 	   typename _Allocator>
     inline _ForwardIterator
-    __uninitialized_fill_copy(_ForwardIterator __result, _ForwardIterator __mid,
+    __uninitialized_fill_move(_ForwardIterator __result, _ForwardIterator __mid,
 			      const _Tp& __x, _InputIterator __first,
 			      _InputIterator __last, _Allocator& __alloc)
     {
       std::__uninitialized_fill_a(__result, __mid, __x, __alloc);
       try
 	{
-	  return std::__uninitialized_copy_a(__first, __last, __mid, __alloc);
+	  return std::__uninitialized_move_a(__first, __last, __mid, __alloc);
 	}
       catch(...)
 	{
@@ -378,18 +406,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	}
     }
 
-  // __uninitialized_copy_fill
-  // Copies [first1, last1) into [first2, first2 + (last1 - first1)), and
+  // __uninitialized_move_fill
+  // Moves [first1, last1) into [first2, first2 + (last1 - first1)), and
   //  fills [first2 + (last1 - first1), last2) with x.
   template<typename _InputIterator, typename _ForwardIterator, typename _Tp,
 	   typename _Allocator>
     inline void
-    __uninitialized_copy_fill(_InputIterator __first1, _InputIterator __last1,
+    __uninitialized_move_fill(_InputIterator __first1, _InputIterator __last1,
 			      _ForwardIterator __first2,
 			      _ForwardIterator __last2, const _Tp& __x,
 			      _Allocator& __alloc)
     {
-      _ForwardIterator __mid2 = std::__uninitialized_copy_a(__first1, __last1,
+      _ForwardIterator __mid2 = std::__uninitialized_move_a(__first1, __last1,
 							    __first2,
 							    __alloc);
       try

libstdc++-v3/include/debug/deque

@@ -254,6 +254,7 @@ namespace __debug
       }
 
       // 23.2.1.3 modifiers:
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
       void
       push_front(const _Tp& __x)
       {
@@ -267,6 +268,34 @@ namespace __debug
 	_Base::push_back(__x);
 	this->_M_invalidate_all();
       }
+#else
+      template<typename... _Args>
+        void
+        push_front(_Args&&... __args)
+	{
+	  _Base::push_front(std::forward<_Args>(__args)...);
+	  this->_M_invalidate_all();
+	}
+
+      template<typename... _Args>
+        void
+        push_back(_Args&&... __args)
+	{
+	  _Base::push_back(std::forward<_Args>(__args)...);
+	  this->_M_invalidate_all();
+	}
+
+      template<typename... _Args>
+        iterator
+        emplace(iterator __position, _Args&&... __args)
+	{
+	  __glibcxx_check_insert(__position);
+	  typename _Base::iterator __res = _Base::emplace(__position.base(),
+					    std::forward<_Args>(__args)...);
+	  this->_M_invalidate_all();
+	  return iterator(__res, this);
+	}
+#endif
 
       iterator
       insert(iterator __position, const _Tp& __x)
@@ -277,6 +306,18 @@ namespace __debug
 	return iterator(__res, this);
       }
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+      iterator
+      insert(iterator __position, _Tp&& __x)
+      {
+	__glibcxx_check_insert(__position);
+	typename _Base::iterator __res = _Base::insert(__position.base(),
+						       std::move(__x));
+	this->_M_invalidate_all();
+	return iterator(__res, this);
+      }
+#endif
+
       void
       insert(iterator __position, size_type __n, const _Tp& __x)
       {

libstdc++-v3/include/debug/vector

@@ -354,7 +354,7 @@ namespace __debug
 	bool __realloc = _M_requires_reallocation(this->size() + 1);
 	difference_type __offset = __position - begin();
 	typename _Base::iterator __res = _Base::insert(__position.base(),
-						       std::forward<_Tp>(__x));
+						       std::move(__x));
 	if (__realloc)
 	  this->_M_invalidate_all();
 	else

libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc

-// { dg-require-rvalref "" }
 // { dg-options "-std=gnu++0x" }
 
 // Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.

libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc

 // { dg-do compile }
-// { dg-require-rvalref "" }
 // { dg-options "-std=gnu++0x" }
 
 // Copyright (C) 2005, 2007 Free Software Foundation, Inc.

libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc

-// { dg-require-rvalref "" }
 // { dg-options "-std=gnu++0x" }
 
 // Copyright (C) 2005, 2007 Free Software Foundation, Inc.

libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc

@@ -19,7 +19,7 @@
 // USA.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1402 }
+// { dg-error "no matching" "" { target *-*-* } 1464 }
 // { dg-excess-errors "" }
 
 #include <deque>

libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc

@@ -19,7 +19,7 @@
 // USA.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1337 }
+// { dg-error "no matching" "" { target *-*-* } 1399 }
 // { dg-excess-errors "" }
 
 #include <deque>

libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc

@@ -19,7 +19,7 @@
 // USA.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1337 }
+// { dg-error "no matching" "" { target *-*-* } 1399 }
 // { dg-excess-errors "" }
 
 #include <deque>

libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc

@@ -19,7 +19,7 @@
 // USA.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1482 }
+// { dg-error "no matching" "" { target *-*-* } 1552 }
 // { dg-excess-errors "" }
 
 #include <deque>