2012-04-12 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / debug / forward_list

diff --git a/libstdc++-v3/include/debug/forward_list b/libstdc++-v3/include/debug/forward_list
index 9f1da5b..295bc63 100644 (file)
--- a/libstdc++-v3/include/debug/forward_list
+++ b/libstdc++-v3/include/debug/forward_list
@@ -46,7 +46,6 @@ namespace __debug
       public __gnu_debug::_Safe_sequence<forward_list<_Tp, _Alloc> >
     {
       typedef _GLIBCXX_STD_C::forward_list<_Tp, _Alloc> _Base;
-      typedef __gnu_debug::_Safe_sequence<forward_list> _Safe_base;
 
       typedef typename _Base::iterator       _Base_iterator;
       typedef typename _Base::const_iterator _Base_const_iterator;
@@ -415,6 +414,10 @@ namespace __debug
       }
 
       void
+      splice_after(const_iterator __pos, forward_list& __list)
+      { splice_after(__pos, std::move(__list)); }
+
+      void
       splice_after(const_iterator __pos, forward_list&& __list,
                   const_iterator __i)
       {
@@ -437,6 +440,11 @@ namespace __debug
       }
 
       void
+      splice_after(const_iterator __pos, forward_list& __list,
+                  const_iterator __i)
+      { splice_after(__pos, std::move(__list), __i); }
+
+      void
       splice_after(const_iterator __pos, forward_list&& __list,
                   const_iterator __before, const_iterator __last)
       {
@@ -482,6 +490,11 @@ namespace __debug
       }
 
       void
+      splice_after(const_iterator __pos, forward_list& __list,
+                  const_iterator __before, const_iterator __last)
+      { splice_after(__pos, std::move(__list), __before, __last); }
+
+      void
       remove(const _Tp& __val)
       {
        _Base_iterator __x = _Base::before_begin();
@@ -562,6 +575,10 @@ namespace __debug
        }
       }
 
+      void
+      merge(forward_list& __list)
+      { merge(std::move(__list)); }
+
       template<typename _Comp>
         void
         merge(forward_list&& __list, _Comp __comp)
@@ -581,6 +598,11 @@ namespace __debug
          }
        }
 
+      template<typename _Comp>
+        void
+        merge(forward_list& __list, _Comp __comp)
+        { merge(std::move(__list), __comp); }
+
       using _Base::sort;
       using _Base::reverse;