Patchwork [v3] Update container::insert / emplace members to take const_iterator(s) (Part 1)

login
register
mail settings
Submitter Paolo Carlini
Date June 27, 2013, 9:55 a.m.
Message ID <51CC0C0A.3070606@oracle.com>
Download mbox | patch
Permalink /patch/255030/
State New
Headers show

Comments

Paolo Carlini - June 27, 2013, 9:55 a.m.
Hi,

this is the first half, touching overloads already returning an 
iterator. The second half will be a tad less trivial because we also 
have to change the return type from void to iterator.

Tested x86_64-linux, normal/debug/profile.

Thanks,
Paolo.

//////////////////////////
2013-06-27  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/stl_deque.h (deque<>::insert(iterator,
	const value_type&), deque<>::insert(iterator, value_type&&),
	deque<>::emplace(iterator, _Args&&...)): Adjust C++11 signatures to
	take a const_iterator.
	(deque<>::erase): Simplify.
	* include/bits/stl_list.h: Likewise.
	(_List_iterator<>::_M_const_cast): Add.
	* include/bits/stl_vector.h: Likewise.
	* include/bits/stl_bvector.h: Likewise.
	(_Bit_iterator::_M_const_cast): Add.
	* include/bits/deque.tcc: Adjust definitions.
	* include/bits/list.tcc: Likewise.
	* include/bits/vector.tcc: Likewise.
	* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
	Define trivial version in C++98 mode.
	* include/ext/vstring.h (__versa_string<>::insert(iterator, _CharT),
	__versa_string<>::replace(iterator, iterator, const __versa_string&),
	__versa_string<>::replace(iterator, iterator, const _CharT*,
	size_type), __versa_string<>::replace(iterator, iterator,
	const _CharT*), __versa_string<>::replace(iterator, iterator,
	size_type, _CharT)): Adjust C++11 signatures to take a pair of
	const_iterators.
	* include/debug/deque: Adjust.
	* include/debug/list: Likewise.
	* include/debug/vector: Likewise.
	* include/profile/deque: Likewise.
	* include/profile/list: Likewise.
	* include/profile/vector: Likewise.
	(vector<>::emplace): Add.
	* testsuite/util/exception/safety.h: Update.
	* testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc:
	New.
	* testsuite/23_containers/deque/modifiers/insert/const_iterator.cc:
	Likewise.
	* testsuite/23_containers/list/modifiers/emplace/const_iterator.cc:
	Likewise.
	* testsuite/23_containers/list/modifiers/insert/const_iterator.cc:
	Likewise.
	* testsuite/23_containers/vector/bool/modifiers/insert/
	const_iterator.cc: Likewise.
	* testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc:
	Likewise.
	* testsuite/23_containers/vector/modifiers/insert/const_iterator.cc:
	Likewise.
	* testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc:
	Likewise.
	* testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc:
	Likewise.
	* testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc:
	Likewise.
	* testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc:
	Likewise.

	* testsuite/ext/vstring/modifiers/char/54577.cc: Move to testsuite/
	ext/vstring/modifiers/erase/char/.
	* testsuite/ext/vstring/modifiers/wchar_t/54577.cc: Move to testsuite/
	ext/vstring/modifiers/wchar_t/.
	* testsuite/ext/vstring/modifiers/char/pop_back.cc: Move to testsuite/
	ext/vstring/modifiers/pop_back/char/.
	* testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc: Move to
	testsuite/ext/vstring/modifiers/pop_back/wchar_t/.

	* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
	Adjust dg-error line number.
	* testsuite/23_containers/deque/requirements/dr438/
	constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/deque/requirements/dr438/
	constructor_2_neg.cc: Likewise.
	* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
	Likewise.
	* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
	Likewise.
	* testsuite/23_containers/list/requirements/dr438/
	constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/list/requirements/dr438/
	constructor_2_neg.cc: Likewise.
	* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
	Likewise.
	* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
	Likewise.
	* testsuite/23_containers/vector/requirements/dr438/
	constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/
	constructor_2_neg.cc: Likewise.
	* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
	Likewise.

Patch

Index: include/bits/deque.tcc
===================================================================
--- include/bits/deque.tcc	(revision 200432)
+++ include/bits/deque.tcc	(working copy)
@@ -143,33 +143,12 @@ 
       }
 #endif
 
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp, _Alloc>::iterator
-    deque<_Tp, _Alloc>::
-    insert(iterator __position, const value_type& __x)
-    {
-      if (__position._M_cur == this->_M_impl._M_start._M_cur)
-	{
-	  push_front(__x);
-	  return this->_M_impl._M_start;
-	}
-      else if (__position._M_cur == this->_M_impl._M_finish._M_cur)
-	{
-	  push_back(__x);
-	  iterator __tmp = this->_M_impl._M_finish;
-	  --__tmp;
-	  return __tmp;
-	}
-      else
-        return _M_insert_aux(__position, __x);
-    }
-
 #if __cplusplus >= 201103L
   template<typename _Tp, typename _Alloc>
     template<typename... _Args>
       typename deque<_Tp, _Alloc>::iterator
       deque<_Tp, _Alloc>::
-      emplace(iterator __position, _Args&&... __args)
+      emplace(const_iterator __position, _Args&&... __args)
       {
 	if (__position._M_cur == this->_M_impl._M_start._M_cur)
 	  {
@@ -184,13 +163,39 @@ 
 	    return __tmp;
 	  }
 	else
-	  return _M_insert_aux(__position, std::forward<_Args>(__args)...);
+	  return _M_insert_aux(__position._M_const_cast(),
+			       std::forward<_Args>(__args)...);
       }
 #endif
 
   template <typename _Tp, typename _Alloc>
     typename deque<_Tp, _Alloc>::iterator
     deque<_Tp, _Alloc>::
+#if __cplusplus >= 201103L
+    insert(const_iterator __position, const value_type& __x)
+#else
+    insert(iterator __position, const value_type& __x)
+#endif
+    {
+      if (__position._M_cur == this->_M_impl._M_start._M_cur)
+	{
+	  push_front(__x);
+	  return this->_M_impl._M_start;
+	}
+      else if (__position._M_cur == this->_M_impl._M_finish._M_cur)
+	{
+	  push_back(__x);
+	  iterator __tmp = this->_M_impl._M_finish;
+	  --__tmp;
+	  return __tmp;
+	}
+      else
+	return _M_insert_aux(__position._M_const_cast(), __x);
+   }
+
+  template <typename _Tp, typename _Alloc>
+    typename deque<_Tp, _Alloc>::iterator
+    deque<_Tp, _Alloc>::
     _M_erase(iterator __position)
     {
       iterator __next = __position;
Index: include/bits/list.tcc
===================================================================
--- include/bits/list.tcc	(revision 200432)
+++ include/bits/list.tcc	(working copy)
@@ -85,10 +85,10 @@ 
     template<typename... _Args>
       typename list<_Tp, _Alloc>::iterator
       list<_Tp, _Alloc>::
-      emplace(iterator __position, _Args&&... __args)
+      emplace(const_iterator __position, _Args&&... __args)
       {
 	_Node* __tmp = _M_create_node(std::forward<_Args>(__args)...);
-	__tmp->_M_hook(__position._M_node);
+	__tmp->_M_hook(__position._M_const_cast()._M_node);
 	return iterator(__tmp);
       }
 #endif
@@ -96,10 +96,14 @@ 
   template<typename _Tp, typename _Alloc>
     typename list<_Tp, _Alloc>::iterator
     list<_Tp, _Alloc>::
+#if __cplusplus >= 201103L
+    insert(const_iterator __position, const value_type& __x)
+#else
     insert(iterator __position, const value_type& __x)
+#endif
     {
       _Node* __tmp = _M_create_node(__x);
-      __tmp->_M_hook(__position._M_node);
+      __tmp->_M_hook(__position._M_const_cast()._M_node);
       return iterator(__tmp);
     }
 
@@ -113,11 +117,7 @@ 
 #endif
     {
       iterator __ret = iterator(__position._M_node->_M_next);
-#if __cplusplus >= 201103L
       _M_erase(__position._M_const_cast());
-#else
-      _M_erase(__position);
-#endif
       return __ret;
     }
 
Index: include/bits/stl_bvector.h
===================================================================
--- include/bits/stl_bvector.h	(revision 200432)
+++ include/bits/stl_bvector.h	(working copy)
@@ -222,6 +222,10 @@ 
     _Bit_iterator(_Bit_type * __x, unsigned int __y)
     : _Bit_iterator_base(__x, __y) { }
 
+    iterator
+    _M_const_cast() const
+    { return *this; }
+
     reference
     operator*() const
     { return reference(_M_p, 1UL << _M_offset); }
@@ -859,14 +863,18 @@ 
     }
 
     iterator
+#if __cplusplus >= 201103L
+    insert(const_iterator __position, const bool& __x = bool())
+#else
     insert(iterator __position, const bool& __x = bool())
+#endif
     {
       const difference_type __n = __position - begin();
       if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_of_storage
 	  && __position == end())
         *this->_M_impl._M_finish++ = __x;
       else
-        _M_insert_aux(__position, __x);
+        _M_insert_aux(__position._M_const_cast(), __x);
       return begin() + __n;
     }
 
@@ -904,20 +912,18 @@ 
     iterator
 #if __cplusplus >= 201103L
     erase(const_iterator __position)
-    { return _M_erase(__position._M_const_cast()); }
 #else
     erase(iterator __position)
-    { return _M_erase(__position); }
 #endif
+    { return _M_erase(__position._M_const_cast()); }
 
     iterator
 #if __cplusplus >= 201103L
     erase(const_iterator __first, const_iterator __last)
-    { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 #else
     erase(iterator __first, iterator __last)
-    { return _M_erase(__first, __last); }
 #endif
+    { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 
     void
     resize(size_type __new_size, bool __x = bool())
Index: include/bits/stl_deque.h
===================================================================
--- include/bits/stl_deque.h	(revision 200432)
+++ include/bits/stl_deque.h	(working copy)
@@ -1458,7 +1458,7 @@ 
 #if __cplusplus >= 201103L
       /**
        *  @brief  Inserts an object in %deque before specified iterator.
-       *  @param  __position  An iterator into the %deque.
+       *  @param  __position  A const_iterator into the %deque.
        *  @param  __args  Arguments.
        *  @return  An iterator that points to the inserted data.
        *
@@ -1467,11 +1467,22 @@ 
        */
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args);
-#endif
+        emplace(const_iterator __position, _Args&&... __args);
 
       /**
        *  @brief  Inserts given value into %deque before specified iterator.
+       *  @param  __position  A const_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 value before the
+       *  specified location.
+       */
+      iterator
+      insert(const_iterator __position, const value_type& __x);
+#else
+      /**
+       *  @brief  Inserts given value 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.
@@ -1481,11 +1492,12 @@ 
        */
       iterator
       insert(iterator __position, const value_type& __x);
+#endif
 
 #if __cplusplus >= 201103L
       /**
        *  @brief  Inserts given rvalue into %deque before specified iterator.
-       *  @param  __position  An iterator into the %deque.
+       *  @param  __position  A const_iterator into the %deque.
        *  @param  __x  Data to be inserted.
        *  @return  An iterator that points to the inserted data.
        *
@@ -1493,7 +1505,7 @@ 
        *  specified location.
        */
       iterator
-      insert(iterator __position, value_type&& __x)
+      insert(const_iterator __position, value_type&& __x)
       { return emplace(__position, std::move(__x)); }
 
       /**
@@ -1568,11 +1580,10 @@ 
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __position)
-      { return _M_erase(__position._M_const_cast()); }
 #else
       erase(iterator __position)
-      { return _M_erase(__position); }
 #endif
+      { return _M_erase(__position._M_const_cast()); }
 
       /**
        *  @brief  Remove a range of elements.
@@ -1593,11 +1604,10 @@ 
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __first, const_iterator __last)
-      { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 #else
       erase(iterator __first, iterator __last)
-      { return _M_erase(__first, __last); }
 #endif
+      { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 
       /**
        *  @brief  Swaps data with another %deque.
Index: include/bits/stl_iterator.h
===================================================================
--- include/bits/stl_iterator.h	(revision 200432)
+++ include/bits/stl_iterator.h	(working copy)
@@ -734,19 +734,20 @@ 
 		      _Container>::__type>& __i)
         : _M_current(__i.base()) { }
 
+#if __cplusplus >= 201103L
       __normal_iterator<typename _Container::pointer, _Container>
       _M_const_cast() const
       {
-#if __cplusplus >= 201103L
 	using _PTraits = std::pointer_traits<typename _Container::pointer>;
 	return __normal_iterator<typename _Container::pointer, _Container>
 	  (_PTraits::pointer_to(const_cast<typename _PTraits::element_type&>
 				(*_M_current)));
+      }
 #else
-        return __normal_iterator<typename _Container::pointer, _Container>
-	  (const_cast<typename _Container::pointer>(_M_current));
+      __normal_iterator
+      _M_const_cast() const
+      { return *this; }
 #endif
-      }
 
       // Forward iterator requirements
       reference
Index: include/bits/stl_list.h
===================================================================
--- include/bits/stl_list.h	(revision 200432)
+++ include/bits/stl_list.h	(working copy)
@@ -140,6 +140,10 @@ 
       _List_iterator(__detail::_List_node_base* __x)
       : _M_node(__x) { }
 
+      _Self
+      _M_const_cast() const
+      { return *this; }
+
       // Must downcast from _List_node_base to _List_node to get to _M_data.
       reference
       operator*() const
@@ -1060,11 +1064,24 @@ 
        */
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args);
-#endif
+        emplace(const_iterator __position, _Args&&... __args);
 
       /**
        *  @brief  Inserts given value into %list before specified iterator.
+       *  @param  __position  A const_iterator into the %list.
+       *  @param  __x  Data to be inserted.
+       *  @return  An iterator that points to the inserted data.
+       *
+       *  This function will insert a copy of the given value before
+       *  the specified location.  Due to the nature of a %list this
+       *  operation can be done in constant time, and does not
+       *  invalidate iterators and references.
+       */
+      iterator
+      insert(const_iterator __position, const value_type& __x);
+#else
+      /**
+       *  @brief  Inserts given value into %list before specified iterator.
        *  @param  __position  An iterator into the %list.
        *  @param  __x  Data to be inserted.
        *  @return  An iterator that points to the inserted data.
@@ -1076,11 +1093,12 @@ 
        */
       iterator
       insert(iterator __position, const value_type& __x);
+#endif
 
 #if __cplusplus >= 201103L
       /**
        *  @brief  Inserts given rvalue into %list before specified iterator.
-       *  @param  __position  An iterator into the %list.
+       *  @param  __position  A const_iterator into the %list.
        *  @param  __x  Data to be inserted.
        *  @return  An iterator that points to the inserted data.
        *
@@ -1090,7 +1108,7 @@ 
        *  invalidate iterators and references.
         */
       iterator
-      insert(iterator __position, value_type&& __x)
+      insert(const_iterator __position, value_type&& __x)
       { return emplace(__position, std::move(__x)); }
 
       /**
@@ -1206,11 +1224,7 @@ 
       {
 	while (__first != __last)
 	  __first = erase(__first);
-#if __cplusplus >= 201103L
 	return __last._M_const_cast();
-#else
-	return __last;
-#endif
       }
 
       /**
Index: include/bits/stl_vector.h
===================================================================
--- include/bits/stl_vector.h	(revision 200432)
+++ include/bits/stl_vector.h	(working copy)
@@ -943,7 +943,7 @@ 
 #if __cplusplus >= 201103L
       /**
        *  @brief  Inserts an object in %vector before specified iterator.
-       *  @param  __position  An iterator into the %vector.
+       *  @param  __position  A const_iterator into the %vector.
        *  @param  __args  Arguments.
        *  @return  An iterator that points to the inserted data.
        *
@@ -955,11 +955,24 @@ 
        */
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args);
-#endif
+        emplace(const_iterator __position, _Args&&... __args);
 
       /**
        *  @brief  Inserts given value into %vector before specified iterator.
+       *  @param  __position  A const_iterator into the %vector.
+       *  @param  __x  Data to be inserted.
+       *  @return  An iterator that points to the inserted data.
+       *
+       *  This function will insert a copy of the given value before
+       *  the specified location.  Note that this kind of operation
+       *  could be expensive for a %vector and if it is frequently
+       *  used the user should consider using std::list.
+       */
+      iterator
+      insert(const_iterator __position, const value_type& __x);
+#else
+      /**
+       *  @brief  Inserts given value into %vector before specified iterator.
        *  @param  __position  An iterator into the %vector.
        *  @param  __x  Data to be inserted.
        *  @return  An iterator that points to the inserted data.
@@ -971,11 +984,12 @@ 
        */
       iterator
       insert(iterator __position, const value_type& __x);
+#endif
 
 #if __cplusplus >= 201103L
       /**
        *  @brief  Inserts given rvalue into %vector before specified iterator.
-       *  @param  __position  An iterator into the %vector.
+       *  @param  __position  A const_iterator into the %vector.
        *  @param  __x  Data to be inserted.
        *  @return  An iterator that points to the inserted data.
        *
@@ -985,7 +999,7 @@ 
        *  used the user should consider using std::list.
        */
       iterator
-      insert(iterator __position, value_type&& __x)
+      insert(const_iterator __position, value_type&& __x)
       { return emplace(__position, std::move(__x)); }
 
       /**
@@ -1074,11 +1088,10 @@ 
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __position)
-      { return _M_erase(__position._M_const_cast()); }
 #else
       erase(iterator __position)
-      { return _M_erase(__position); }
 #endif
+      { return _M_erase(__position._M_const_cast()); }
 
       /**
        *  @brief  Remove a range of elements.
@@ -1101,11 +1114,10 @@ 
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __first, const_iterator __last)
-      { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 #else
       erase(iterator __first, iterator __last)
-      { return _M_erase(__first, __last); }
 #endif
+      { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 
       /**
        *  @brief  Swaps data with another %vector.
@@ -1119,7 +1131,7 @@ 
       void
       swap(vector& __x)
 #if __cplusplus >= 201103L
-			noexcept(_Alloc_traits::_S_nothrow_swap())
+      noexcept(_Alloc_traits::_S_nothrow_swap())
 #endif
       {
 	this->_M_impl._M_swap_data(__x._M_impl);
Index: include/bits/vector.tcc
===================================================================
--- include/bits/vector.tcc	(revision 200432)
+++ include/bits/vector.tcc	(working copy)
@@ -105,7 +105,11 @@ 
   template<typename _Tp, typename _Alloc>
     typename vector<_Tp, _Alloc>::iterator
     vector<_Tp, _Alloc>::
+#if __cplusplus >= 201103L
+    insert(const_iterator __position, const value_type& __x)
+#else
     insert(iterator __position, const value_type& __x)
+#endif
     {
       const size_type __n = __position - begin();
       if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage
@@ -120,11 +124,11 @@ 
 	  if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
 	    {
 	      _Tp __x_copy = __x;
-	      _M_insert_aux(__position, std::move(__x_copy));
+	      _M_insert_aux(__position._M_const_cast(), std::move(__x_copy));
 	    }
 	  else
 #endif
-	    _M_insert_aux(__position, __x);
+	    _M_insert_aux(__position._M_const_cast(), __x);
 	}
       return iterator(this->_M_impl._M_start + __n);
     }
@@ -292,7 +296,7 @@ 
     template<typename... _Args>
       typename vector<_Tp, _Alloc>::iterator
       vector<_Tp, _Alloc>::
-      emplace(iterator __position, _Args&&... __args)
+      emplace(const_iterator __position, _Args&&... __args)
       {
 	const size_type __n = __position - begin();
 	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage
@@ -303,7 +307,8 @@ 
 	    ++this->_M_impl._M_finish;
 	  }
 	else
-	  _M_insert_aux(__position, std::forward<_Args>(__args)...);
+	  _M_insert_aux(__position._M_const_cast(),
+			std::forward<_Args>(__args)...);
 	return iterator(this->_M_impl._M_start + __n);
       }
 
Index: include/debug/deque
===================================================================
--- include/debug/deque	(revision 200432)
+++ include/debug/deque	(working copy)
@@ -383,7 +383,7 @@ 
 
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args)
+        emplace(const_iterator __position, _Args&&... __args)
 	{
 	  __glibcxx_check_insert(__position);
 	  _Base_iterator __res = _Base::emplace(__position.base(),
@@ -394,7 +394,11 @@ 
 #endif
 
       iterator
+#if __cplusplus >= 201103L
+      insert(const_iterator __position, const _Tp& __x)
+#else
       insert(iterator __position, const _Tp& __x)
+#endif
       {
 	__glibcxx_check_insert(__position);
 	_Base_iterator __res = _Base::insert(__position.base(), __x);
@@ -404,7 +408,7 @@ 
 
 #if __cplusplus >= 201103L
       iterator
-      insert(iterator __position, _Tp&& __x)
+      insert(const_iterator __position, _Tp&& __x)
       { return emplace(__position, std::move(__x)); }
 
       void
Index: include/debug/list
===================================================================
--- include/debug/list	(revision 200432)
+++ include/debug/list	(working copy)
@@ -379,7 +379,7 @@ 
 #if __cplusplus >= 201103L
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args)
+        emplace(const_iterator __position, _Args&&... __args)
 	{
 	  __glibcxx_check_insert(__position);
 	  return iterator(_Base::emplace(__position.base(),
@@ -387,16 +387,20 @@ 
 	}
 #endif
 
-      iterator
-      insert(iterator __position, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
+     iterator
+#if __cplusplus >= 201103L
+     insert(const_iterator __position, const _Tp& __x)
+#else
+     insert(iterator __position, const _Tp& __x)
+#endif
+     {
+       __glibcxx_check_insert(__position);
+       return iterator(_Base::insert(__position.base(), __x), this);
+     }
 
 #if __cplusplus >= 201103L
       iterator
-      insert(iterator __position, _Tp&& __x)
+      insert(const_iterator __position, _Tp&& __x)
       { return emplace(__position, std::move(__x)); }
 
       void
Index: include/debug/vector
===================================================================
--- include/debug/vector	(revision 200432)
+++ include/debug/vector	(working copy)
@@ -429,7 +429,7 @@ 
 #if __cplusplus >= 201103L
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args)
+        emplace(const_iterator __position, _Args&&... __args)
 	{
 	  __glibcxx_check_insert(__position);
 	  bool __realloc = _M_requires_reallocation(this->size() + 1);
@@ -446,7 +446,11 @@ 
 #endif
 
       iterator
+#if __cplusplus >= 201103L
+      insert(const_iterator __position, const _Tp& __x)
+#else
       insert(iterator __position, const _Tp& __x)
+#endif
       {
 	__glibcxx_check_insert(__position);
 	bool __realloc = _M_requires_reallocation(this->size() + 1);
@@ -464,7 +468,7 @@ 
       template<typename _Up = _Tp>
         typename __gnu_cxx::__enable_if<!std::__are_same<_Up, bool>::__value,
 					iterator>::__type
-        insert(iterator __position, _Tp&& __x)
+        insert(const_iterator __position, _Tp&& __x)
         { return emplace(__position, std::move(__x)); }
 
       void
Index: include/ext/vstring.h
===================================================================
--- include/ext/vstring.h	(revision 200432)
+++ include/ext/vstring.h	(working copy)
@@ -1087,7 +1087,11 @@ 
        *  change if an error is thrown.
       */
       iterator
-      insert(iterator __p, _CharT __c)
+#if __cplusplus >= 201103L
+      insert(const_iterator __p, _CharT __c)
+#else
+      insert(iterator __p, _CharT __c)	
+#endif
       {
 	_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
 	const size_type __pos = __p - _M_ibegin();
@@ -1313,7 +1317,12 @@ 
        *  the string doesn't change if an error is thrown.
       */
       __versa_string&
+#if __cplusplus >= 201103L
+      replace(const_iterator __i1, const_iterator __i2,
+	      const __versa_string& __str)
+#else
       replace(iterator __i1, iterator __i2, const __versa_string& __str)
+#endif
       { return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
 
       /**
@@ -1331,7 +1340,12 @@ 
        *  value of the string doesn't change if an error is thrown.
       */
       __versa_string&
+#if __cplusplus >= 201103L
+      replace(const_iterator __i1, const_iterator __i2,
+	      const _CharT* __s, size_type __n)
+#else
       replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
+#endif
       {
 	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
 				 && __i2 <= _M_iend());
@@ -1352,7 +1366,11 @@ 
        *  the string doesn't change if an error is thrown.
       */
       __versa_string&
-      replace(iterator __i1, iterator __i2, const _CharT* __s)
+#if __cplusplus >= 201103L
+      replace(const_iterator __i1, const_iterator __i2, const _CharT* __s)
+#else
+      replace(iterator __i1, iterator __i2, const _CharT* __s)	
+#endif
       {
 	__glibcxx_requires_string(__s);
 	return this->replace(__i1, __i2, __s, traits_type::length(__s));
@@ -1373,7 +1391,12 @@ 
        *  the string doesn't change if an error is thrown.
       */
       __versa_string&
+#if __cplusplus >= 201103L
+      replace(const_iterator __i1, const_iterator __i2, size_type __n,
+	      _CharT __c)
+#else
       replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
+#endif
       {
 	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
 				 && __i2 <= _M_iend());
Index: include/profile/deque
===================================================================
--- include/profile/deque	(revision 200432)
+++ include/profile/deque	(working copy)
@@ -320,7 +320,7 @@ 
 
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args)
+        emplace(const_iterator __position, _Args&&... __args)
 	{
 	  typename _Base::iterator __res = _Base::emplace(__position,
 					    std::forward<_Args>(__args)...);
@@ -329,7 +329,11 @@ 
 #endif
 
       iterator
+#if __cplusplus >= 201103L
+      insert(const_iterator __position, const _Tp& __x)
+#else
       insert(iterator __position, const _Tp& __x)
+#endif
       {
 	typename _Base::iterator __res = _Base::insert(__position, __x);
 	return iterator(__res);
@@ -337,7 +341,7 @@ 
 
 #if __cplusplus >= 201103L
       iterator
-      insert(iterator __position, _Tp&& __x)
+      insert(const_iterator __position, _Tp&& __x)
       { return emplace(__position, std::move(__x)); }
 
       void
Index: include/profile/list
===================================================================
--- include/profile/list	(revision 200432)
+++ include/profile/list	(working copy)
@@ -335,7 +335,7 @@ 
 #if __cplusplus >= 201103L
       template<typename... _Args>
         iterator
-        emplace(iterator __position, _Args&&... __args)
+        emplace(const_iterator __position, _Args&&... __args)
 	{
 	  return iterator(_Base::emplace(__position.base(),
                                          std::forward<_Args>(__args)...),
@@ -344,7 +344,11 @@ 
 #endif
 
       iterator
+#if __cplusplus >= 201103L
+      insert(const_iterator __position, const _Tp& __x)
+#else
       insert(iterator __position, const _Tp& __x)
+#endif
       {
         _M_profile_insert(this, __position, size());
         return iterator(_Base::insert(__position.base(), __x), this);
@@ -352,8 +356,8 @@ 
 
 #if __cplusplus >= 201103L
       iterator
-      insert(iterator __position, _Tp&& __x)
-      { 
+      insert(const_iterator __position, _Tp&& __x)
+      {
         _M_profile_insert(this, __position, size());
         return iterator(_Base::emplace(__position.base(), std::move(__x)),
                         this); 
@@ -606,11 +610,12 @@ 
       }
 
     private:
-      size_type _M_profile_insert(void* obj, iterator __pos, size_type __size)
+      size_type
+      _M_profile_insert(void* obj, const_iterator __pos, size_type __size)
       {
         size_type __shift = 0;
-        typename _Base::iterator __it = __pos.base();
-        for ( ; __it!=_Base::end(); __it++)
+        typename _Base::const_iterator __it = __pos.base();
+        for (; __it != _Base::end(); ++__it)
           __shift++;
         __profcxx_list_rewind(this);
         __profcxx_list_operation(this);
Index: include/profile/vector
===================================================================
--- include/profile/vector	(revision 200432)
+++ include/profile/vector	(working copy)
@@ -352,7 +352,11 @@ 
 #endif
 
       iterator
+#if __cplusplus >= 201103L
+      insert(const_iterator __position, const _Tp& __x)
+#else
       insert(iterator __position, const _Tp& __x)
+#endif
       {
         __profcxx_vector_insert(this, __position.base() - _Base::begin(),
                                 this->size());
@@ -364,7 +368,7 @@ 
 
 #if __cplusplus >= 201103L
       iterator
-      insert(iterator __position, _Tp&& __x)
+      insert(const_iterator __position, _Tp&& __x)
       {
         __profcxx_vector_insert(this, __position.base() - _Base::begin(),
                                 this->size());
@@ -374,6 +378,16 @@ 
 	return iterator(__res, this);
       }
 
+      template<typename... _Args>
+        iterator
+        emplace(const_iterator __position, _Args&&... __args)
+        {
+	  typename _Base::iterator __res
+	    = _Base::emplace(__position.base(),
+			     std::forward<_Args>(__args)...);
+	  return iterator(__res, this);
+	}
+
       void
       insert(iterator __position, initializer_list<value_type> __l)
       { this->insert(__position, __l.begin(), __l.end()); }
@@ -423,7 +437,6 @@ 
         _M_profile_resize(this, __old_size, this->capacity());
       }
 
-
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __position)
Index: testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc
===================================================================
--- testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc	(revision 0)
+++ testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc	(working copy)
@@ -0,0 +1,27 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <deque>
+
+void test01()
+{
+  std::deque<int> d1;
+  d1.emplace(d1.cbegin(), 1);
+}
Index: testsuite/23_containers/deque/modifiers/insert/const_iterator.cc
===================================================================
--- testsuite/23_containers/deque/modifiers/insert/const_iterator.cc	(revision 0)
+++ testsuite/23_containers/deque/modifiers/insert/const_iterator.cc	(working copy)
@@ -0,0 +1,29 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <deque>
+
+void test01()
+{
+  std::deque<int> d1;
+  int n = 0;
+  d1.insert(d1.cbegin(), n);
+  d1.insert(d1.cbegin(), 1);
+}
Index: testsuite/23_containers/deque/requirements/dr438/assign_neg.cc
===================================================================
--- testsuite/23_containers/deque/requirements/dr438/assign_neg.cc	(revision 200432)
+++ testsuite/23_containers/deque/requirements/dr438/assign_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1714 }
+// { dg-error "no matching" "" { target *-*-* } 1724 }
 
 #include <deque>
 
Index: testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc
===================================================================
--- testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc	(revision 200432)
+++ testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1647 }
+// { dg-error "no matching" "" { target *-*-* } 1657 }
 
 #include <deque>
 
Index: testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc
===================================================================
--- testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc	(revision 200432)
+++ testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1647 }
+// { dg-error "no matching" "" { target *-*-* } 1657 }
 
 #include <deque>
 #include <utility>
Index: testsuite/23_containers/deque/requirements/dr438/insert_neg.cc
===================================================================
--- testsuite/23_containers/deque/requirements/dr438/insert_neg.cc	(revision 200432)
+++ testsuite/23_containers/deque/requirements/dr438/insert_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1798 }
+// { dg-error "no matching" "" { target *-*-* } 1808 }
 
 #include <deque>
 
Index: testsuite/23_containers/list/modifiers/emplace/const_iterator.cc
===================================================================
--- testsuite/23_containers/list/modifiers/emplace/const_iterator.cc	(revision 0)
+++ testsuite/23_containers/list/modifiers/emplace/const_iterator.cc	(working copy)
@@ -0,0 +1,27 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <list>
+
+void test01()
+{
+  std::list<int> l1;
+  l1.emplace(l1.cbegin(), 1);
+}
Index: testsuite/23_containers/list/modifiers/insert/const_iterator.cc
===================================================================
--- testsuite/23_containers/list/modifiers/insert/const_iterator.cc	(revision 0)
+++ testsuite/23_containers/list/modifiers/insert/const_iterator.cc	(working copy)
@@ -0,0 +1,29 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <list>
+
+void test01()
+{
+  std::list<int> l1;
+  int n = 0;
+  l1.insert(l1.cbegin(), n);
+  l1.insert(l1.cbegin(), 1);
+}
Index: testsuite/23_containers/list/requirements/dr438/assign_neg.cc
===================================================================
--- testsuite/23_containers/list/requirements/dr438/assign_neg.cc	(revision 200432)
+++ testsuite/23_containers/list/requirements/dr438/assign_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1545 }
+// { dg-error "no matching" "" { target *-*-* } 1559 }
 
 #include <list>
 
Index: testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc
===================================================================
--- testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc	(revision 200432)
+++ testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1497 }
+// { dg-error "no matching" "" { target *-*-* } 1511 }
 
 #include <list>
 
Index: testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
===================================================================
--- testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc	(revision 200432)
+++ testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1497 }
+// { dg-error "no matching" "" { target *-*-* } 1511 }
 
 #include <list>
 #include <utility>
Index: testsuite/23_containers/list/requirements/dr438/insert_neg.cc
===================================================================
--- testsuite/23_containers/list/requirements/dr438/insert_neg.cc	(revision 200432)
+++ testsuite/23_containers/list/requirements/dr438/insert_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1497 }
+// { dg-error "no matching" "" { target *-*-* } 1511 }
 
 #include <list>
 
Index: testsuite/23_containers/vector/bool/modifiers/insert/const_iterator.cc
===================================================================
--- testsuite/23_containers/vector/bool/modifiers/insert/const_iterator.cc	(revision 0)
+++ testsuite/23_containers/vector/bool/modifiers/insert/const_iterator.cc	(working copy)
@@ -0,0 +1,27 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <vector>
+
+void test01()
+{
+  std::vector<bool> vb1;
+  vb1.insert(vb1.cbegin(), true);
+}
Index: testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc
===================================================================
--- testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc	(revision 0)
+++ testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc	(working copy)
@@ -0,0 +1,27 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <vector>
+
+void test01()
+{
+  std::vector<int> v1;
+  v1.emplace(v1.cbegin(), 1);
+}
Index: testsuite/23_containers/vector/modifiers/insert/const_iterator.cc
===================================================================
--- testsuite/23_containers/vector/modifiers/insert/const_iterator.cc	(revision 0)
+++ testsuite/23_containers/vector/modifiers/insert/const_iterator.cc	(working copy)
@@ -0,0 +1,29 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <vector>
+
+void test01()
+{
+  std::vector<int> v1;
+  int n = 0;
+  v1.insert(v1.cbegin(), n);
+  v1.insert(v1.cbegin(), 1);
+}
Index: testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
===================================================================
--- testsuite/23_containers/vector/requirements/dr438/assign_neg.cc	(revision 200432)
+++ testsuite/23_containers/vector/requirements/dr438/assign_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1252 }
+// { dg-error "no matching" "" { target *-*-* } 1264 }
 
 #include <vector>
 
Index: testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
===================================================================
--- testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc	(revision 200432)
+++ testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1178 }
+// { dg-error "no matching" "" { target *-*-* } 1190 }
 
 #include <vector>
 
Index: testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
===================================================================
--- testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc	(revision 200432)
+++ testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1178 }
+// { dg-error "no matching" "" { target *-*-* } 1190 }
 
 #include <vector>
 #include <utility>
Index: testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
===================================================================
--- testsuite/23_containers/vector/requirements/dr438/insert_neg.cc	(revision 200432)
+++ testsuite/23_containers/vector/requirements/dr438/insert_neg.cc	(working copy)
@@ -18,7 +18,7 @@ 
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1293 }
+// { dg-error "no matching" "" { target *-*-* } 1305 }
 
 #include <vector>
 
Index: testsuite/ext/vstring/modifiers/char/54577.cc
===================================================================
--- testsuite/ext/vstring/modifiers/char/54577.cc	(revision 200432)
+++ testsuite/ext/vstring/modifiers/char/54577.cc	(working copy)
@@ -1,33 +0,0 @@ 
-// { dg-options "-std=gnu++11" }
-// { dg-do compile }
-
-// Copyright (C) 2013 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 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <ext/vstring.h>
-
-void test01() 
-{
-  __gnu_cxx::__vstring vs1;
-  vs1.push_back('1');
-  vs1.erase(vs1.cbegin());
-
-  __gnu_cxx::__vstring vs2;
-  vs2.push_back('2');
-  vs2.push_back('3');
-  vs2.erase(vs2.cbegin(), vs2.cend());
-}
Index: testsuite/ext/vstring/modifiers/char/pop_back.cc
===================================================================
--- testsuite/ext/vstring/modifiers/char/pop_back.cc	(revision 200432)
+++ testsuite/ext/vstring/modifiers/char/pop_back.cc	(working copy)
@@ -1,45 +0,0 @@ 
-// Copyright (C) 2011-2013 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 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-// 21.4.6.5 basic_string::pop_back
-// { dg-options "-std=gnu++0x" }
-
-#include <ext/vstring.h>
-#include <testsuite_hooks.h>
-
-template<typename StrT>
-int test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  const StrT cstr("Badger");
-  StrT str = cstr;
-  str.pop_back();
-  VERIFY( str.size() == cstr.size() - 1 );
-
-  str += cstr.back();
-  VERIFY( str == cstr );
-
-  return test;
-}
-
-int main()
-{ 
-  test01<__gnu_cxx::__sso_string>();
-  test01<__gnu_cxx::__rc_string>();
-  return 0;
-}
Index: testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc
===================================================================
--- testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc	(revision 0)
+++ testsuite/ext/vstring/modifiers/insert/char/const_iterator.cc	(working copy)
@@ -0,0 +1,27 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <ext/vstring.h>
+
+void test01() 
+{
+  __gnu_cxx::__vstring vs1;
+  vs1.insert(vs1.cbegin(), '1');
+}
Index: testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc
===================================================================
--- testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc	(revision 0)
+++ testsuite/ext/vstring/modifiers/insert/wchar_t/const_iterator.cc	(working copy)
@@ -0,0 +1,27 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <ext/vstring.h>
+
+void test01() 
+{
+  __gnu_cxx::__wvstring wvs1;
+  wvs1.insert(wvs1.cbegin(), L'1');
+}
Index: testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc
===================================================================
--- testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc	(revision 0)
+++ testsuite/ext/vstring/modifiers/replace/char/const_iterator.cc	(working copy)
@@ -0,0 +1,30 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <ext/vstring.h>
+
+void test01() 
+{
+  __gnu_cxx::__vstring vs1;
+  vs1.replace(vs1.cbegin(), vs1.cend(), vs1);
+  vs1.replace(vs1.cbegin(), vs1.cend(), "1", 1);
+  vs1.replace(vs1.cbegin(), vs1.cend(), "2");
+  vs1.replace(vs1.cbegin(), vs1.cend(), 1, '3');
+}
Index: testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc
===================================================================
--- testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc	(revision 0)
+++ testsuite/ext/vstring/modifiers/replace/wchar_t/const_iterator.cc	(working copy)
@@ -0,0 +1,30 @@ 
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <ext/vstring.h>
+
+void test01() 
+{
+  __gnu_cxx::__wvstring wvs1;
+  wvs1.replace(wvs1.cbegin(), wvs1.cend(), wvs1);
+  wvs1.replace(wvs1.cbegin(), wvs1.cend(), L"1", 1);
+  wvs1.replace(wvs1.cbegin(), wvs1.cend(), L"2");
+  wvs1.replace(wvs1.cbegin(), wvs1.cend(), 1, L'3');
+}
Index: testsuite/ext/vstring/modifiers/wchar_t/54577.cc
===================================================================
--- testsuite/ext/vstring/modifiers/wchar_t/54577.cc	(revision 200432)
+++ testsuite/ext/vstring/modifiers/wchar_t/54577.cc	(working copy)
@@ -1,33 +0,0 @@ 
-// { dg-options "-std=gnu++11" }
-// { dg-do compile }
-
-// Copyright (C) 2013 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 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <ext/vstring.h>
-
-void test01() 
-{
-  __gnu_cxx::__wvstring wvs1;
-  wvs1.push_back(L'1');
-  wvs1.erase(wvs1.cbegin());
-
-  __gnu_cxx::__wvstring wvs2;
-  wvs2.push_back(L'2');
-  wvs2.push_back(L'3');
-  wvs2.erase(wvs2.cbegin(), wvs2.cend());
-}
Index: testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc
===================================================================
--- testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc	(revision 200432)
+++ testsuite/ext/vstring/modifiers/wchar_t/pop_back.cc	(working copy)
@@ -1,45 +0,0 @@ 
-// Copyright (C) 2011-2013 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 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even 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 COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-// 21.4.6.5 basic_string::pop_back
-// { dg-options "-std=gnu++0x" }
-
-#include <ext/vstring.h>
-#include <testsuite_hooks.h>
-
-template<typename StrT>
-int test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  const StrT cstr(L"Badger");
-  StrT str = cstr;
-  str.pop_back();
-  VERIFY( str.size() == cstr.size() - 1 );
-
-  str += cstr.back();
-  VERIFY( str == cstr );
-
-  return test;
-}
-
-int main()
-{ 
-  test01<__gnu_cxx::__wsso_string>();
-  test01<__gnu_cxx::__wrc_string>();
-  return 0;
-}
Index: testsuite/util/exception/safety.h
===================================================================
--- testsuite/util/exception/safety.h	(revision 200432)
+++ testsuite/util/exception/safety.h	(working copy)
@@ -265,7 +265,7 @@ 
 	: _F_erase_point(&_Tp::erase), _F_erase_range(&_Tp::erase) { }
       };
 
-    // Specializations, old C++03 signatures.
+    // Specialization, old C++03 signature.
     template<typename _Tp1, typename _Tp2, typename _Tp3>
       struct erase_base<std::basic_string<_Tp1, _Tp2, _Tp3>>
       {
@@ -280,24 +280,6 @@ 
 	  _F_erase_range(&container_type::erase) { }
       };
 
-    template<typename _Tp1, typename _Tp2, typename _Tp3,
-	     template <typename, typename, typename> class _Tp4>
-      struct erase_base<__gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3, _Tp4>>
-      {
-	typedef __gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3, _Tp4>
-	                                                container_type;
-	typedef typename container_type::iterator 	iterator;
-	typedef typename container_type::const_iterator const_iterator;
-
-	iterator (container_type::* _F_erase_point)(const_iterator);
-	iterator (container_type::* _F_erase_range)(const_iterator,
-						    const_iterator);
-
-	erase_base()
-	: _F_erase_point(&container_type::erase),
-	  _F_erase_range(&container_type::erase) { }
-      };
-
     // Specialization, as forward_list has erase_after.
     template<typename _Tp1, typename _Tp2>
       struct erase_base<std::forward_list<_Tp1, _Tp2>>
@@ -698,47 +680,7 @@ 
 	insert_base() : _F_insert_point(&_Tp::insert) { }
       };
 
-    // Specializations, old C++03 signatures.
-    template<typename _Tp1, typename _Tp2>
-      struct insert_base<std::deque<_Tp1, _Tp2>>
-      {
-	typedef std::deque<_Tp1, _Tp2> 	                container_type;
-	typedef typename container_type::iterator 	iterator;
-	typedef typename container_type::value_type 	value_type;
-
-	iterator (container_type::* _F_insert_point)(iterator,
-						     const value_type&);
-
-	insert_base() : _F_insert_point(&container_type::insert) { }
-      };
-
-    template<typename _Tp1, typename _Tp2>
-      struct insert_base<std::list<_Tp1, _Tp2>>
-      {
-	typedef std::list<_Tp1, _Tp2>    	        container_type;
-	typedef typename container_type::iterator 	iterator;
-	typedef typename container_type::value_type 	value_type;
-
-	iterator (container_type::* _F_insert_point)(iterator,
-						     const value_type&);
-
-	insert_base() : _F_insert_point(&container_type::insert) { }
-      };
-
-    template<typename _Tp1, typename _Tp2>
-      struct insert_base<std::vector<_Tp1, _Tp2>>
-      {
-	typedef std::vector<_Tp1, _Tp2> 	        container_type;
-	typedef typename container_type::iterator 	iterator;
-	typedef typename container_type::value_type 	value_type;
-
-	iterator (container_type::* _F_insert_point)(iterator,
-						     const value_type&);
-
-	insert_base() : _F_insert_point(&container_type::insert) { }
-      };
-
-    // Specialization, as string insertion has a different signature.
+    // Specialization, old C++03 signature.
     template<typename _Tp1, typename _Tp2, typename _Tp3>
       struct insert_base<std::basic_string<_Tp1, _Tp2, _Tp3>>
       {
@@ -751,17 +693,19 @@ 
 	insert_base() : _F_insert_point(&container_type::insert) { }
       };
 
-    // Likewise for __versa_string.
+    // Specialization, by value.
     template<typename _Tp1, typename _Tp2, typename _Tp3,
 	     template <typename, typename, typename> class _Tp4>
       struct insert_base<__gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3, _Tp4>>
       {
 	typedef __gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3, _Tp4>
-	                                                container_type;
-	typedef typename container_type::iterator 	iterator;
-	typedef typename container_type::value_type 	value_type;
+                                                        container_type;
+	typedef typename container_type::iterator       iterator;
+	typedef typename container_type::const_iterator const_iterator;
+	typedef typename container_type::value_type     value_type;
 
-	iterator (container_type::* _F_insert_point)(iterator, value_type);
+	iterator (container_type::* _F_insert_point)(const_iterator,
+						     value_type);
 
 	insert_base() : _F_insert_point(&container_type::insert) { }
       };