Implement resolutions of LWG 2399, 2400 and 2401.
[gcc.git] / libstdc++-v3 / include / bits / stl_algo.h
index f337e0c07a659fb4d379a0e7a25d9f2ca07b045c..0ce73c1bbb3fd7d80dd29eb3742ab164fceb5b93 100644 (file)
@@ -1,8 +1,6 @@
 // Algorithm implementation -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-// 2010, 2011
-// Free Software Foundation, Inc.
+// Copyright (C) 2001-2014 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
 #include <bits/algorithmfwd.h>
 #include <bits/stl_heap.h>
 #include <bits/stl_tempbuf.h>  // for _Temporary_buffer
+#include <bits/predefined_ops.h>
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
 #include <random>     // for std::uniform_int_distribution
-#include <functional> // for std::bind
 #endif
 
 // See concept_check.h for the __glibcxx_*_requires macros.
@@ -74,129 +72,41 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-  /// Swaps the median value of *__a, *__b and *__c to *__a
-  template<typename _Iterator>
-    void
-    __move_median_first(_Iterator __a, _Iterator __b, _Iterator __c)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<
-           typename iterator_traits<_Iterator>::value_type>)
-
-      if (*__a < *__b)
-       {
-         if (*__b < *__c)
-           std::iter_swap(__a, __b);
-         else if (*__a < *__c)
-           std::iter_swap(__a, __c);
-       }
-      else if (*__a < *__c)
-       return;
-      else if (*__b < *__c)
-       std::iter_swap(__a, __c);
-      else
-       std::iter_swap(__a, __b);
-    }
-
-  /// Swaps the median value of *__a, *__b and *__c under __comp to *__a
+  /// Swaps the median value of *__a, *__b and *__c under __comp to *__result
   template<typename _Iterator, typename _Compare>
     void
-    __move_median_first(_Iterator __a, _Iterator __b, _Iterator __c,
-                       _Compare __comp)
+    __move_median_to_first(_Iterator __result,_Iterator __a, _Iterator __b,
+                          _Iterator __c, _Compare __comp)
     {
-      // concept requirements
-      __glibcxx_function_requires(_BinaryFunctionConcept<_Compare, bool,
-           typename iterator_traits<_Iterator>::value_type,
-           typename iterator_traits<_Iterator>::value_type>)
-
-      if (__comp(*__a, *__b))
+      if (__comp(__a, __b))
        {
-         if (__comp(*__b, *__c))
-           std::iter_swap(__a, __b);
-         else if (__comp(*__a, *__c))
-           std::iter_swap(__a, __c);
+         if (__comp(__b, __c))
+           std::iter_swap(__result, __b);
+         else if (__comp(__a, __c))
+           std::iter_swap(__result, __c);
+         else
+           std::iter_swap(__result, __a);
        }
-      else if (__comp(*__a, *__c))
-       return;
-      else if (__comp(*__b, *__c))
-       std::iter_swap(__a, __c);
+      else if (__comp(__a, __c))
+       std::iter_swap(__result, __a);
+      else if (__comp(__b, __c))
+       std::iter_swap(__result, __c);
       else
-       std::iter_swap(__a, __b);
+       std::iter_swap(__result, __b);
     }
 
-  // for_each
-
-  /// This is an overload used by find() for the Input Iterator case.
-  template<typename _InputIterator, typename _Tp>
-    inline _InputIterator
-    __find(_InputIterator __first, _InputIterator __last,
-          const _Tp& __val, input_iterator_tag)
-    {
-      while (__first != __last && !(*__first == __val))
-       ++__first;
-      return __first;
-    }
-
-  /// This is an overload used by find_if() for the Input Iterator case.
+  /// This is an overload used by find algos for the Input Iterator case.
   template<typename _InputIterator, typename _Predicate>
     inline _InputIterator
     __find_if(_InputIterator __first, _InputIterator __last,
              _Predicate __pred, input_iterator_tag)
     {
-      while (__first != __last && !bool(__pred(*__first)))
+      while (__first != __last && !__pred(__first))
        ++__first;
       return __first;
     }
 
-  /// This is an overload used by find() for the RAI case.
-  template<typename _RandomAccessIterator, typename _Tp>
-    _RandomAccessIterator
-    __find(_RandomAccessIterator __first, _RandomAccessIterator __last,
-          const _Tp& __val, random_access_iterator_tag)
-    {
-      typename iterator_traits<_RandomAccessIterator>::difference_type
-       __trip_count = (__last - __first) >> 2;
-
-      for (; __trip_count > 0; --__trip_count)
-       {
-         if (*__first == __val)
-           return __first;
-         ++__first;
-
-         if (*__first == __val)
-           return __first;
-         ++__first;
-
-         if (*__first == __val)
-           return __first;
-         ++__first;
-
-         if (*__first == __val)
-           return __first;
-         ++__first;
-       }
-
-      switch (__last - __first)
-       {
-       case 3:
-         if (*__first == __val)
-           return __first;
-         ++__first;
-       case 2:
-         if (*__first == __val)
-           return __first;
-         ++__first;
-       case 1:
-         if (*__first == __val)
-           return __first;
-         ++__first;
-       case 0:
-       default:
-         return __last;
-       }
-    }
-
-  /// This is an overload used by find_if() for the RAI case.
+  /// This is an overload used by find algos for the RAI case.
   template<typename _RandomAccessIterator, typename _Predicate>
     _RandomAccessIterator
     __find_if(_RandomAccessIterator __first, _RandomAccessIterator __last,
@@ -207,19 +117,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       for (; __trip_count > 0; --__trip_count)
        {
-         if (__pred(*__first))
+         if (__pred(__first))
            return __first;
          ++__first;
 
-         if (__pred(*__first))
+         if (__pred(__first))
            return __first;
          ++__first;
 
-         if (__pred(*__first))
+         if (__pred(__first))
            return __first;
          ++__first;
 
-         if (__pred(*__first))
+         if (__pred(__first))
            return __first;
          ++__first;
        }
@@ -227,15 +137,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       switch (__last - __first)
        {
        case 3:
-         if (__pred(*__first))
+         if (__pred(__first))
            return __first;
          ++__first;
        case 2:
-         if (__pred(*__first))
+         if (__pred(__first))
            return __first;
          ++__first;
        case 1:
-         if (__pred(*__first))
+         if (__pred(__first))
            return __first;
          ++__first;
        case 0:
@@ -244,63 +154,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        }
     }
 
-  /// This is an overload used by find_if_not() for the Input Iterator case.
-  template<typename _InputIterator, typename _Predicate>
-    inline _InputIterator
-    __find_if_not(_InputIterator __first, _InputIterator __last,
-                 _Predicate __pred, input_iterator_tag)
-    {
-      while (__first != __last && bool(__pred(*__first)))
-       ++__first;
-      return __first;
-    }
-
-  /// This is an overload used by find_if_not() for the RAI case.
-  template<typename _RandomAccessIterator, typename _Predicate>
-    _RandomAccessIterator
-    __find_if_not(_RandomAccessIterator __first, _RandomAccessIterator __last,
-                 _Predicate __pred, random_access_iterator_tag)
+  template<typename _Iterator, typename _Predicate>
+    inline _Iterator
+    __find_if(_Iterator __first, _Iterator __last, _Predicate __pred)
     {
-      typename iterator_traits<_RandomAccessIterator>::difference_type
-       __trip_count = (__last - __first) >> 2;
-
-      for (; __trip_count > 0; --__trip_count)
-       {
-         if (!bool(__pred(*__first)))
-           return __first;
-         ++__first;
-
-         if (!bool(__pred(*__first)))
-           return __first;
-         ++__first;
-
-         if (!bool(__pred(*__first)))
-           return __first;
-         ++__first;
-
-         if (!bool(__pred(*__first)))
-           return __first;
-         ++__first;
-       }
-
-      switch (__last - __first)
-       {
-       case 3:
-         if (!bool(__pred(*__first)))
-           return __first;
-         ++__first;
-       case 2:
-         if (!bool(__pred(*__first)))
-           return __first;
-         ++__first;
-       case 1:
-         if (!bool(__pred(*__first)))
-           return __first;
-         ++__first;
-       case 0:
-       default:
-         return __last;
-       }
+      return __find_if(__first, __last, __pred,
+                      std::__iterator_category(__first));
     }
 
   /// Provided for stable_partition to use.
@@ -309,8 +168,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     __find_if_not(_InputIterator __first, _InputIterator __last,
                  _Predicate __pred)
     {
-      return std::__find_if_not(__first, __last, __pred,
-                               std::__iterator_category(__first));
+      return std::__find_if(__first, __last,
+                           __gnu_cxx::__ops::__negate(__pred),
+                           std::__iterator_category(__first));
     }
 
   /// Like find_if_not(), but uses and updates a count of the
@@ -321,7 +181,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     __find_if_not_n(_InputIterator __first, _Distance& __len, _Predicate __pred)
     {
       for (; __len; --__len, ++__first)
-       if (!bool(__pred(*__first)))
+       if (!__pred(__first))
          break;
       return __first;
     }
@@ -339,113 +199,73 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   // count_if
   // search
 
-  /**
-   *  This is an uglified
-   *  search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&)
-   *  overloaded for forward iterators.
-  */
-  template<typename _ForwardIterator, typename _Integer, typename _Tp>
-    _ForwardIterator
-    __search_n(_ForwardIterator __first, _ForwardIterator __last,
-              _Integer __count, const _Tp& __val,
-              std::forward_iterator_tag)
+  template<typename _ForwardIterator1, typename _ForwardIterator2,
+          typename _BinaryPredicate>
+    _ForwardIterator1
+    __search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
+            _ForwardIterator2 __first2, _ForwardIterator2 __last2,
+            _BinaryPredicate  __predicate)
     {
-      __first = _GLIBCXX_STD_A::find(__first, __last, __val);
-      while (__first != __last)
-       {
-         typename iterator_traits<_ForwardIterator>::difference_type
-           __n = __count;
-         _ForwardIterator __i = __first;
-         ++__i;
-         while (__i != __last && __n != 1 && *__i == __val)
-           {
-             ++__i;
-             --__n;
-           }
-         if (__n == 1)
-           return __first;
-         if (__i == __last)
-           return __last;
-         __first = _GLIBCXX_STD_A::find(++__i, __last, __val);
-       }
-      return __last;
-    }
+      // Test for empty ranges
+      if (__first1 == __last1 || __first2 == __last2)
+       return __first1;
 
-  /**
-   *  This is an uglified
-   *  search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&)
-   *  overloaded for random access iterators.
-  */
-  template<typename _RandomAccessIter, typename _Integer, typename _Tp>
-    _RandomAccessIter
-    __search_n(_RandomAccessIter __first, _RandomAccessIter __last,
-              _Integer __count, const _Tp& __val, 
-              std::random_access_iterator_tag)
-    {
-      
-      typedef typename std::iterator_traits<_RandomAccessIter>::difference_type
-       _DistanceType;
+      // Test for a pattern of length 1.
+      _ForwardIterator2 __p1(__first2);
+      if (++__p1 == __last2)
+       return std::__find_if(__first1, __last1,
+               __gnu_cxx::__ops::__iter_comp_iter(__predicate, __first2));
 
-      _DistanceType __tailSize = __last - __first;
-      const _DistanceType __pattSize = __count;
+      // General case.
+      _ForwardIterator2 __p;
+      _ForwardIterator1 __current = __first1;
 
-      if (__tailSize < __pattSize)
-        return __last;
+      for (;;)
+       {
+         __first1 =
+           std::__find_if(__first1, __last1,
+               __gnu_cxx::__ops::__iter_comp_iter(__predicate, __first2));
 
-      const _DistanceType __skipOffset = __pattSize - 1;
-      _RandomAccessIter __lookAhead = __first + __skipOffset;
-      __tailSize -= __pattSize;
+         if (__first1 == __last1)
+           return __last1;
 
-      while (1) // the main loop...
-       {
-         // __lookAhead here is always pointing to the last element of next 
-         // possible match.
-         while (!(*__lookAhead == __val)) // the skip loop...
-           {
-             if (__tailSize < __pattSize)
-               return __last;  // Failure
-             __lookAhead += __pattSize;
-             __tailSize -= __pattSize;
-           }
-         _DistanceType __remainder = __skipOffset;
-         for (_RandomAccessIter __backTrack = __lookAhead - 1; 
-              *__backTrack == __val; --__backTrack)
+         __p = __p1;
+         __current = __first1;
+         if (++__current == __last1)
+           return __last1;
+
+         while (__predicate(__current, __p))
            {
-             if (--__remainder == 0)
-               return (__lookAhead - __skipOffset); // Success
+             if (++__p == __last2)
+               return __first1;
+             if (++__current == __last1)
+               return __last1;
            }
-         if (__remainder > __tailSize)
-           return __last; // Failure
-         __lookAhead += __remainder;
-         __tailSize -= __remainder;
+         ++__first1;
        }
+      return __first1;
     }
 
   // search_n
 
   /**
-   *  This is an uglified
-   *  search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&,
-   *          _BinaryPredicate)
-   *  overloaded for forward iterators.
+   *  This is an helper function for search_n overloaded for forward iterators.
   */
-  template<typename _ForwardIterator, typename _Integer, typename _Tp,
-           typename _BinaryPredicate>
+  template<typename _ForwardIterator, typename _Integer,
+          typename _UnaryPredicate>
     _ForwardIterator
-    __search_n(_ForwardIterator __first, _ForwardIterator __last,
-              _Integer __count, const _Tp& __val,
-              _BinaryPredicate __binary_pred, std::forward_iterator_tag)
+    __search_n_aux(_ForwardIterator __first, _ForwardIterator __last,
+                  _Integer __count, _UnaryPredicate __unary_pred,
+                  std::forward_iterator_tag)
     {
-      while (__first != __last && !bool(__binary_pred(*__first, __val)))
-        ++__first;
-
+      __first = std::__find_if(__first, __last, __unary_pred);
       while (__first != __last)
        {
          typename iterator_traits<_ForwardIterator>::difference_type
            __n = __count;
          _ForwardIterator __i = __first;
          ++__i;
-         while (__i != __last && __n != 1 && bool(__binary_pred(*__i, __val)))
+         while (__i != __last && __n != 1 && __unary_pred(__i))
            {
              ++__i;
              --__n;
@@ -454,94 +274,63 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            return __first;
          if (__i == __last)
            return __last;
-         __first = ++__i;
-         while (__first != __last
-                && !bool(__binary_pred(*__first, __val)))
-           ++__first;
+         __first = std::__find_if(++__i, __last, __unary_pred);
        }
       return __last;
     }
 
   /**
-   *  This is an uglified
-   *  search_n(_ForwardIterator, _ForwardIterator, _Integer, const _Tp&,
-   *          _BinaryPredicate)
-   *  overloaded for random access iterators.
+   *  This is an helper function for search_n overloaded for random access
+   *  iterators.
   */
-  template<typename _RandomAccessIter, typename _Integer, typename _Tp,
-          typename _BinaryPredicate>
+  template<typename _RandomAccessIter, typename _Integer,
+          typename _UnaryPredicate>
     _RandomAccessIter
-    __search_n(_RandomAccessIter __first, _RandomAccessIter __last,
-              _Integer __count, const _Tp& __val,
-              _BinaryPredicate __binary_pred, std::random_access_iterator_tag)
+    __search_n_aux(_RandomAccessIter __first, _RandomAccessIter __last,
+                  _Integer __count, _UnaryPredicate __unary_pred,
+                  std::random_access_iterator_tag)
     {
-      
       typedef typename std::iterator_traits<_RandomAccessIter>::difference_type
        _DistanceType;
 
       _DistanceType __tailSize = __last - __first;
-      const _DistanceType __pattSize = __count;
-
-      if (__tailSize < __pattSize)
-        return __last;
-
-      const _DistanceType __skipOffset = __pattSize - 1;
-      _RandomAccessIter __lookAhead = __first + __skipOffset;
-      __tailSize -= __pattSize;
+      _DistanceType __remainder = __count;
 
-      while (1) // the main loop...
+      while (__remainder <= __tailSize) // the main loop...
        {
-         // __lookAhead here is always pointing to the last element of next 
-         // possible match.
-         while (!bool(__binary_pred(*__lookAhead, __val))) // the skip loop...
-           {
-             if (__tailSize < __pattSize)
-               return __last;  // Failure
-             __lookAhead += __pattSize;
-             __tailSize -= __pattSize;
-           }
-         _DistanceType __remainder = __skipOffset;
-         for (_RandomAccessIter __backTrack = __lookAhead - 1; 
-              __binary_pred(*__backTrack, __val); --__backTrack)
+         __first += __remainder;
+         __tailSize -= __remainder;
+         // __first here is always pointing to one past the last element of
+         // next possible match.
+         _RandomAccessIter __backTrack = __first; 
+         while (__unary_pred(--__backTrack))
            {
              if (--__remainder == 0)
-               return (__lookAhead - __skipOffset); // Success
+               return (__first - __count); // Success
            }
-         if (__remainder > __tailSize)
-           return __last; // Failure
-         __lookAhead += __remainder;
-         __tailSize -= __remainder;
+         __remainder = __count + 1 - (__first - __backTrack);
        }
+      return __last; // Failure
     }
 
-  // find_end for forward iterators.
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    _ForwardIterator1
-    __find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-              _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-              forward_iterator_tag, forward_iterator_tag)
+  template<typename _ForwardIterator, typename _Integer,
+           typename _UnaryPredicate>
+    _ForwardIterator
+    __search_n(_ForwardIterator __first, _ForwardIterator __last,
+              _Integer __count,
+              _UnaryPredicate __unary_pred)
     {
-      if (__first2 == __last2)
-       return __last1;
-      else
-       {
-         _ForwardIterator1 __result = __last1;
-         while (1)
-           {
-             _ForwardIterator1 __new_result
-               = _GLIBCXX_STD_A::search(__first1, __last1, __first2, __last2);
-             if (__new_result == __last1)
-               return __result;
-             else
-               {
-                 __result = __new_result;
-                 __first1 = __new_result;
-                 ++__first1;
-               }
-           }
-       }
+      if (__count <= 0)
+       return __first;
+
+      if (__count == 1)
+       return std::__find_if(__first, __last, __unary_pred);
+
+      return std::__search_n_aux(__first, __last, __count, __unary_pred,
+                                std::__iterator_category(__first));
     }
 
+  // find_end for forward iterators.
   template<typename _ForwardIterator1, typename _ForwardIterator2,
           typename _BinaryPredicate>
     _ForwardIterator1
@@ -552,61 +341,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       if (__first2 == __last2)
        return __last1;
-      else
+
+      _ForwardIterator1 __result = __last1;
+      while (1)
        {
-         _ForwardIterator1 __result = __last1;
-         while (1)
+         _ForwardIterator1 __new_result
+           = std::__search(__first1, __last1, __first2, __last2, __comp);
+         if (__new_result == __last1)
+           return __result;
+         else
            {
-             _ForwardIterator1 __new_result
-               = _GLIBCXX_STD_A::search(__first1, __last1, __first2,
-                                        __last2, __comp);
-             if (__new_result == __last1)
-               return __result;
-             else
-               {
-                 __result = __new_result;
-                 __first1 = __new_result;
-                 ++__first1;
-               }
+             __result = __new_result;
+             __first1 = __new_result;
+             ++__first1;
            }
        }
     }
 
   // find_end for bidirectional iterators (much faster).
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2>
-    _BidirectionalIterator1
-    __find_end(_BidirectionalIterator1 __first1,
-              _BidirectionalIterator1 __last1,
-              _BidirectionalIterator2 __first2,
-              _BidirectionalIterator2 __last2,
-              bidirectional_iterator_tag, bidirectional_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-                                 _BidirectionalIterator1>)
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-                                 _BidirectionalIterator2>)
-
-      typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1;
-      typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2;
-
-      _RevIterator1 __rlast1(__first1);
-      _RevIterator2 __rlast2(__first2);
-      _RevIterator1 __rresult = _GLIBCXX_STD_A::search(_RevIterator1(__last1),
-                                                      __rlast1,
-                                                      _RevIterator2(__last2),
-                                                      __rlast2);
-
-      if (__rresult == __rlast1)
-       return __last1;
-      else
-       {
-         _BidirectionalIterator1 __result = __rresult.base();
-         std::advance(__result, -std::distance(__first2, __last2));
-         return __result;
-       }
-    }
-
   template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
           typename _BinaryPredicate>
     _BidirectionalIterator1
@@ -628,9 +380,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       _RevIterator1 __rlast1(__first1);
       _RevIterator2 __rlast2(__first2);
-      _RevIterator1 __rresult = std::search(_RevIterator1(__last1), __rlast1,
-                                           _RevIterator2(__last2), __rlast2,
-                                           __comp);
+      _RevIterator1 __rresult = std::__search(_RevIterator1(__last1), __rlast1,
+                                             _RevIterator2(__last2), __rlast2,
+                                             __comp);
 
       if (__rresult == __rlast1)
        return __last1;
@@ -659,7 +411,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  [__first2,__last2) and returns an iterator to the __first
    *  element of the sub-sequence, or @p __last1 if the sub-sequence
    *  is not found.  The sub-sequence will be the last such
-   *  subsequence contained in [__first,__last1).
+   *  subsequence contained in [__first1,__last1).
    *
    *  Because the sub-sequence must lie completely within the range @p
    *  [__first1,__last1) it must start at a position less than @p
@@ -684,7 +436,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       return std::__find_end(__first1, __last1, __first2, __last2,
                             std::__iterator_category(__first1),
-                            std::__iterator_category(__first2));
+                            std::__iterator_category(__first2),
+                            __gnu_cxx::__ops::__iter_equal_to_iter());
     }
 
   /**
@@ -734,10 +487,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return std::__find_end(__first1, __last1, __first2, __last2,
                             std::__iterator_category(__first1),
                             std::__iterator_category(__first2),
-                            __comp);
+                            __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
   /**
    *  @brief  Checks that a predicate is true for all the elements
    *          of a sequence.
@@ -810,7 +563,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
              typename iterator_traits<_InputIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
-      return std::__find_if_not(__first, __last, __pred);
+      return std::__find_if_not(__first, __last,
+                               __gnu_cxx::__ops::__pred_iter(__pred));
     }
 
   /**
@@ -879,14 +633,28 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 #endif
 
-
-  /**
-   *  @brief Copy a sequence, removing elements of a given value.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __result  An output iterator.
-   *  @param  __value   The value to be removed.
+  template<typename _InputIterator, typename _OutputIterator,
+          typename _Predicate>
+    _OutputIterator
+    __remove_copy_if(_InputIterator __first, _InputIterator __last,
+                    _OutputIterator __result, _Predicate __pred)
+    {
+      for (; __first != __last; ++__first)
+       if (!__pred(__first))
+         {
+           *__result = *__first;
+           ++__result;
+         }
+      return __result;
+    }
+
+  /**
+   *  @brief Copy a sequence, removing elements of a given value.
+   *  @ingroup mutating_algorithms
+   *  @param  __first   An input iterator.
+   *  @param  __last    An input iterator.
+   *  @param  __result  An output iterator.
+   *  @param  __value   The value to be removed.
    *  @return   An iterator designating the end of the resulting sequence.
    *
    *  Copies each element in the range @p [__first,__last) not equal
@@ -895,7 +663,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  are copied is unchanged.
   */
   template<typename _InputIterator, typename _OutputIterator, typename _Tp>
-    _OutputIterator
+    inline _OutputIterator
     remove_copy(_InputIterator __first, _InputIterator __last,
                _OutputIterator __result, const _Tp& __value)
     {
@@ -907,13 +675,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_InputIterator>::value_type, _Tp>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      for (; __first != __last; ++__first)
-       if (!(*__first == __value))
-         {
-           *__result = *__first;
-           ++__result;
-         }
-      return __result;
+      return std::__remove_copy_if(__first, __last, __result,
+       __gnu_cxx::__ops::__iter_equals_val(__value));
     }
 
   /**
@@ -933,7 +696,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   */
   template<typename _InputIterator, typename _OutputIterator,
           typename _Predicate>
-    _OutputIterator
+    inline _OutputIterator
     remove_copy_if(_InputIterator __first, _InputIterator __last,
                   _OutputIterator __result, _Predicate __pred)
     {
@@ -945,16 +708,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_InputIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      for (; __first != __last; ++__first)
-       if (!bool(__pred(*__first)))
-         {
-           *__result = *__first;
-           ++__result;
-         }
-      return __result;
+      return std::__remove_copy_if(__first, __last, __result,
+                                  __gnu_cxx::__ops::__pred_iter(__pred));
     }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
   /**
    *  @brief Copy the elements of a sequence for which a predicate is true.
    *  @ingroup mutating_algorithms
@@ -993,7 +751,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return __result;
     }
 
-
   template<typename _InputIterator, typename _Size, typename _OutputIterator>
     _OutputIterator
     __copy_n(_InputIterator __first, _Size __n,
@@ -1095,6 +852,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 #endif
 
+  template<typename _ForwardIterator, typename _Predicate>
+    _ForwardIterator
+    __remove_if(_ForwardIterator __first, _ForwardIterator __last,
+               _Predicate __pred)
+    {
+      __first = std::__find_if(__first, __last, __pred);
+      if (__first == __last)
+        return __first;
+      _ForwardIterator __result = __first;
+      ++__first;
+      for (; __first != __last; ++__first)
+        if (!__pred(__first))
+          {
+            *__result = _GLIBCXX_MOVE(*__first);
+            ++__result;
+          }
+      return __result;
+    }
+
   /**
    *  @brief Remove elements from a sequence.
    *  @ingroup mutating_algorithms
@@ -1113,7 +889,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  are still present, but their value is unspecified.
   */
   template<typename _ForwardIterator, typename _Tp>
-    _ForwardIterator
+    inline _ForwardIterator
     remove(_ForwardIterator __first, _ForwardIterator __last,
           const _Tp& __value)
     {
@@ -1124,18 +900,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      __first = _GLIBCXX_STD_A::find(__first, __last, __value);
-      if(__first == __last)
-        return __first;
-      _ForwardIterator __result = __first;
-      ++__first;
-      for(; __first != __last; ++__first)
-        if(!(*__first == __value))
-          {
-            *__result = _GLIBCXX_MOVE(*__first);
-            ++__result;
-          }
-      return __result;
+      return std::__remove_if(__first, __last,
+               __gnu_cxx::__ops::__iter_equals_val(__value));
     }
 
   /**
@@ -1156,7 +922,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  are still present, but their value is unspecified.
   */
   template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
+    inline _ForwardIterator
     remove_if(_ForwardIterator __first, _ForwardIterator __last,
              _Predicate __pred)
     {
@@ -1167,18 +933,44 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      __first = _GLIBCXX_STD_A::find_if(__first, __last, __pred);
-      if(__first == __last)
-        return __first;
-      _ForwardIterator __result = __first;
+      return std::__remove_if(__first, __last,
+                             __gnu_cxx::__ops::__pred_iter(__pred));
+    }
+
+  template<typename _ForwardIterator, typename _BinaryPredicate>
+    _ForwardIterator
+    __adjacent_find(_ForwardIterator __first, _ForwardIterator __last,
+                   _BinaryPredicate __binary_pred)
+    {
+      if (__first == __last)
+       return __last;
+      _ForwardIterator __next = __first;
+      while (++__next != __last)
+       {
+         if (__binary_pred(__first, __next))
+           return __first;
+         __first = __next;
+       }
+      return __last;
+    }
+
+  template<typename _ForwardIterator, typename _BinaryPredicate>
+    _ForwardIterator
+    __unique(_ForwardIterator __first, _ForwardIterator __last,
+            _BinaryPredicate __binary_pred)
+    {
+      // Skip the beginning, if already unique.
+      __first = std::__adjacent_find(__first, __last, __binary_pred);
+      if (__first == __last)
+       return __last;
+
+      // Do the real copy work.
+      _ForwardIterator __dest = __first;
       ++__first;
-      for(; __first != __last; ++__first)
-        if(!bool(__pred(*__first)))
-          {
-            *__result = _GLIBCXX_MOVE(*__first);
-            ++__result;
-          }
-      return __result;
+      while (++__first != __last)
+       if (!__binary_pred(__dest, __first))
+         *++__dest = _GLIBCXX_MOVE(*__first);
+      return ++__dest;
     }
 
   /**
@@ -1196,7 +988,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  are still present, but their value is unspecified.
   */
   template<typename _ForwardIterator>
-    _ForwardIterator
+    inline _ForwardIterator
     unique(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
@@ -1206,18 +998,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                     typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      // Skip the beginning, if already unique.
-      __first = _GLIBCXX_STD_A::adjacent_find(__first, __last);
-      if (__first == __last)
-       return __last;
-
-      // Do the real copy work.
-      _ForwardIterator __dest = __first;
-      ++__first;
-      while (++__first != __last)
-       if (!(*__dest == *__first))
-         *++__dest = _GLIBCXX_MOVE(*__first);
-      return ++__dest;
+      return std::__unique(__first, __last,
+                          __gnu_cxx::__ops::__iter_equal_to_iter());
     }
 
   /**
@@ -1236,7 +1018,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  are still present, but their value is unspecified.
   */
   template<typename _ForwardIterator, typename _BinaryPredicate>
-    _ForwardIterator
+    inline _ForwardIterator
     unique(_ForwardIterator __first, _ForwardIterator __last,
            _BinaryPredicate __binary_pred)
     {
@@ -1248,83 +1030,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      // Skip the beginning, if already unique.
-      __first = _GLIBCXX_STD_A::adjacent_find(__first, __last, __binary_pred);
-      if (__first == __last)
-       return __last;
-
-      // Do the real copy work.
-      _ForwardIterator __dest = __first;
-      ++__first;
-      while (++__first != __last)
-       if (!bool(__binary_pred(*__dest, *__first)))
-         *++__dest = _GLIBCXX_MOVE(*__first);
-      return ++__dest;
-    }
-
-  /**
-   *  This is an uglified unique_copy(_InputIterator, _InputIterator,
-   *                                  _OutputIterator)
-   *  overloaded for forward iterators and output iterator as result.
-  */
-  template<typename _ForwardIterator, typename _OutputIterator>
-    _OutputIterator
-    __unique_copy(_ForwardIterator __first, _ForwardIterator __last,
-                 _OutputIterator __result,
-                 forward_iterator_tag, output_iterator_tag)
-    {
-      // concept requirements -- taken care of in dispatching function
-      _ForwardIterator __next = __first;
-      *__result = *__first;
-      while (++__next != __last)
-       if (!(*__first == *__next))
-         {
-           __first = __next;
-           *++__result = *__first;
-         }
-      return ++__result;
-    }
-
-  /**
-   *  This is an uglified unique_copy(_InputIterator, _InputIterator,
-   *                                  _OutputIterator)
-   *  overloaded for input iterators and output iterator as result.
-  */
-  template<typename _InputIterator, typename _OutputIterator>
-    _OutputIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-                 _OutputIterator __result,
-                 input_iterator_tag, output_iterator_tag)
-    {
-      // concept requirements -- taken care of in dispatching function
-      typename iterator_traits<_InputIterator>::value_type __value = *__first;
-      *__result = __value;
-      while (++__first != __last)
-       if (!(__value == *__first))
-         {
-           __value = *__first;
-           *++__result = __value;
-         }
-      return ++__result;
-    }
-
-  /**
-   *  This is an uglified unique_copy(_InputIterator, _InputIterator,
-   *                                  _OutputIterator)
-   *  overloaded for input iterators and forward iterator as result.
-  */
-  template<typename _InputIterator, typename _ForwardIterator>
-    _ForwardIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-                 _ForwardIterator __result,
-                 input_iterator_tag, forward_iterator_tag)
-    {
-      // concept requirements -- taken care of in dispatching function
-      *__result = *__first;
-      while (++__first != __last)
-       if (!(*__result == *__first))
-         *++__result = *__first;
-      return ++__result;
+      return std::__unique(__first, __last,
+                          __gnu_cxx::__ops::__iter_comp_iter(__binary_pred));
     }
 
   /**
@@ -1348,7 +1055,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _ForwardIterator __next = __first;
       *__result = *__first;
       while (++__next != __last)
-       if (!bool(__binary_pred(*__first, *__next)))
+       if (!__binary_pred(__first, __next))
          {
            __first = __next;
            *++__result = *__first;
@@ -1375,9 +1082,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          typename iterator_traits<_InputIterator>::value_type>)
 
       typename iterator_traits<_InputIterator>::value_type __value = *__first;
+      __decltype(__gnu_cxx::__ops::__iter_comp_val(__binary_pred))
+       __rebound_pred
+       = __gnu_cxx::__ops::__iter_comp_val(__binary_pred);
       *__result = __value;
       while (++__first != __last)
-       if (!bool(__binary_pred(__value, *__first)))
+       if (!__rebound_pred(__first, __value))
          {
            __value = *__first;
            *++__result = __value;
@@ -1402,10 +1112,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
          typename iterator_traits<_ForwardIterator>::value_type,
          typename iterator_traits<_InputIterator>::value_type>)
-
       *__result = *__first;
       while (++__first != __last)
-       if (!bool(__binary_pred(*__result, *__first)))
+       if (!__binary_pred(__result, __first))
          *++__result = *__first;
       return ++__result;
     }
@@ -1486,7 +1195,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  range @p [__result,__result+(__last-__first)) such that the
    *  order of the elements is reversed.  For every @c i such that @p
    *  0<=i<=(__last-__first), @p reverse_copy() performs the
-   *  assignment @p *(__result+(__last-__first)-i) = *(__first+i).
+   *  assignment @p *(__result+(__last-__first)-1-i) = *(__first+i).
    *  The ranges @p [__first,__last) and @p
    *  [__result,__result+(__last-__first)) must not overlap.
   */
@@ -1707,9 +1416,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_valid_range(__first, __middle);
       __glibcxx_requires_valid_range(__middle, __last);
 
-      typedef typename iterator_traits<_ForwardIterator>::iterator_category
-       _IterType;
-      std::__rotate(__first, __middle, __last, _IterType());
+      std::__rotate(__first, __middle, __last,
+                   std::__iterator_category(__first));
     }
 
   /**
@@ -1733,7 +1441,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  for each @p n in the range @p [0,__last-__first).
   */
   template<typename _ForwardIterator, typename _OutputIterator>
-    _OutputIterator
+    inline _OutputIterator
     rotate_copy(_ForwardIterator __first, _ForwardIterator __middle,
                 _ForwardIterator __last, _OutputIterator __result)
     {
@@ -1804,38 +1512,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   // partition
 
   /// This is a helper function...
-  /// Requires __len != 0 and !__pred(*__first),
-  /// same as __stable_partition_adaptive.
-  template<typename _ForwardIterator, typename _Predicate, typename _Distance>
-    _ForwardIterator
-    __inplace_stable_partition(_ForwardIterator __first,
-                              _Predicate __pred, _Distance __len)
-    {
-      if (__len == 1)
-       return __first;
-      _ForwardIterator __middle = __first;
-      std::advance(__middle, __len / 2);
-      _ForwardIterator __left_split =
-       std::__inplace_stable_partition(__first, __pred, __len / 2);
-      // Advance past true-predicate values to satisfy this
-      // function's preconditions.
-      _Distance __right_len = __len - __len / 2;
-      _ForwardIterator __right_split =
-       std::__find_if_not_n(__middle, __right_len, __pred);
-      if (__right_len)
-       __right_split = std::__inplace_stable_partition(__middle,
-                                                       __pred,
-                                                       __right_len);
-      std::rotate(__left_split, __middle, __right_split);
-      std::advance(__left_split, std::distance(__middle, __right_split));
-      return __left_split;
-    }
-
-  /// This is a helper function...
-  /// Requires __first != __last and !__pred(*__first)
+  /// Requires __first != __last and !__pred(__first)
   /// and __len == distance(__first, __last).
   ///
-  /// !__pred(*__first) allows us to guarantee that we don't
+  /// !__pred(__first) allows us to guarantee that we don't
   /// move-assign an element onto itself.
   template<typename _ForwardIterator, typename _Pointer, typename _Predicate,
           typename _Distance>
@@ -1846,18 +1526,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                                _Pointer __buffer,
                                _Distance __buffer_size)
     {
+      if (__len == 1)
+       return __first;
+
       if (__len <= __buffer_size)
        {
          _ForwardIterator __result1 = __first;
          _Pointer __result2 = __buffer;
-         // The precondition guarantees that !__pred(*__first), so
+
+         // The precondition guarantees that !__pred(__first), so
          // move that element to the buffer before starting the loop.
          // This ensures that we only call __pred once per element.
          *__result2 = _GLIBCXX_MOVE(*__first);
          ++__result2;
          ++__first;
          for (; __first != __last; ++__first)
-           if (__pred(*__first))
+           if (__pred(__first))
              {
                *__result1 = _GLIBCXX_MOVE(*__first);
                ++__result1;
@@ -1867,31 +1551,56 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                *__result2 = _GLIBCXX_MOVE(*__first);
                ++__result2;
              }
+
          _GLIBCXX_MOVE3(__buffer, __result2, __result1);
          return __result1;
        }
-      else
-       {
-         _ForwardIterator __middle = __first;
-         std::advance(__middle, __len / 2);
-         _ForwardIterator __left_split =
-           std::__stable_partition_adaptive(__first, __middle, __pred,
-                                            __len / 2, __buffer,
-                                            __buffer_size);
-         // Advance past true-predicate values to satisfy this
-         // function's preconditions.
-         _Distance __right_len = __len - __len / 2;
-         _ForwardIterator __right_split =
-           std::__find_if_not_n(__middle, __right_len, __pred);
-         if (__right_len)
-           __right_split =
-             std::__stable_partition_adaptive(__right_split, __last, __pred,
-                                              __right_len,
-                                              __buffer, __buffer_size);
-         std::rotate(__left_split, __middle, __right_split);
-         std::advance(__left_split, std::distance(__middle, __right_split));
-         return __left_split;
-       }
+
+      _ForwardIterator __middle = __first;
+      std::advance(__middle, __len / 2);
+      _ForwardIterator __left_split =
+       std::__stable_partition_adaptive(__first, __middle, __pred,
+                                        __len / 2, __buffer,
+                                        __buffer_size);
+
+      // Advance past true-predicate values to satisfy this
+      // function's preconditions.
+      _Distance __right_len = __len - __len / 2;
+      _ForwardIterator __right_split =
+       std::__find_if_not_n(__middle, __right_len, __pred);
+
+      if (__right_len)
+       __right_split =
+         std::__stable_partition_adaptive(__right_split, __last, __pred,
+                                          __right_len,
+                                          __buffer, __buffer_size);
+
+      std::rotate(__left_split, __middle, __right_split);
+      std::advance(__left_split, std::distance(__middle, __right_split));
+      return __left_split;
+    }
+
+  template<typename _ForwardIterator, typename _Predicate>
+    _ForwardIterator
+    __stable_partition(_ForwardIterator __first, _ForwardIterator __last,
+                      _Predicate __pred)
+    {
+      __first = std::__find_if_not(__first, __last, __pred);
+
+      if (__first == __last)
+       return __first;
+
+      typedef typename iterator_traits<_ForwardIterator>::value_type
+       _ValueType;
+      typedef typename iterator_traits<_ForwardIterator>::difference_type
+       _DistanceType;
+
+      _Temporary_buffer<_ForwardIterator, _ValueType> __buf(__first, __last);
+      return
+       std::__stable_partition_adaptive(__first, __last, __pred,
+                                        _DistanceType(__buf.requested_size()),
+                                        __buf.begin(),
+                                        _DistanceType(__buf.size()));
     }
 
   /**
@@ -1912,7 +1621,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  relative ordering after calling @p stable_partition().
   */
   template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
+    inline _ForwardIterator
     stable_partition(_ForwardIterator __first, _ForwardIterator __last,
                     _Predicate __pred)
     {
@@ -1923,43 +1632,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      __first = std::__find_if_not(__first, __last, __pred);
-
-      if (__first == __last)
-       return __first;
-      else
-       {
-         typedef typename iterator_traits<_ForwardIterator>::value_type
-           _ValueType;
-         typedef typename iterator_traits<_ForwardIterator>::difference_type
-           _DistanceType;
-
-         _Temporary_buffer<_ForwardIterator, _ValueType> __buf(__first,
-                                                               __last);
-       if (__buf.size() > 0)
-         return
-           std::__stable_partition_adaptive(__first, __last, __pred,
-                                         _DistanceType(__buf.requested_size()),
-                                         __buf.begin(),
-                                         _DistanceType(__buf.size()));
-       else
-         return
-           std::__inplace_stable_partition(__first, __pred,
-                                        _DistanceType(__buf.requested_size()));
-       }
-    }
-
-  /// This is a helper function for the sort routines.
-  template<typename _RandomAccessIterator>
-    void
-    __heap_select(_RandomAccessIterator __first,
-                 _RandomAccessIterator __middle,
-                 _RandomAccessIterator __last)
-    {
-      std::make_heap(__first, __middle);
-      for (_RandomAccessIterator __i = __middle; __i < __last; ++__i)
-       if (*__i < *__first)
-         std::__pop_heap(__first, __middle, __i);
+      return std::__stable_partition(__first, __last,
+                                    __gnu_cxx::__ops::__pred_iter(__pred));
     }
 
   /// This is a helper function for the sort routines.
@@ -1969,15 +1643,52 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                  _RandomAccessIterator __middle,
                  _RandomAccessIterator __last, _Compare __comp)
     {
-      std::make_heap(__first, __middle, __comp);
+      std::__make_heap(__first, __middle, __comp);
       for (_RandomAccessIterator __i = __middle; __i < __last; ++__i)
-       if (__comp(*__i, *__first))
+       if (__comp(__i, __first))
          std::__pop_heap(__first, __middle, __i, __comp);
     }
 
   // partial_sort
 
-  /**
+  template<typename _InputIterator, typename _RandomAccessIterator,
+          typename _Compare>
+    _RandomAccessIterator
+    __partial_sort_copy(_InputIterator __first, _InputIterator __last,
+                       _RandomAccessIterator __result_first,
+                       _RandomAccessIterator __result_last,
+                       _Compare __comp)
+    {
+      typedef typename iterator_traits<_InputIterator>::value_type
+       _InputValueType;
+      typedef iterator_traits<_RandomAccessIterator> _RItTraits;
+      typedef typename _RItTraits::difference_type _DistanceType;
+
+      if (__result_first == __result_last)
+       return __result_last;
+      _RandomAccessIterator __result_real_last = __result_first;
+      while (__first != __last && __result_real_last != __result_last)
+       {
+         *__result_real_last = *__first;
+         ++__result_real_last;
+         ++__first;
+       }
+      
+      std::__make_heap(__result_first, __result_real_last, __comp);
+      while (__first != __last)
+       {
+         if (__comp(__first, __result_first))
+           std::__adjust_heap(__result_first, _DistanceType(0),
+                              _DistanceType(__result_real_last
+                                            - __result_first),
+                              _InputValueType(*__first), __comp);
+         ++__first;
+       }
+      std::__sort_heap(__result_first, __result_real_last, __comp);
+      return __result_real_last;
+    }
+
+  /**
    *  @brief Copy the smallest elements of a sequence.
    *  @ingroup sorting_algorithms
    *  @param  __first   An iterator.
@@ -1996,7 +1707,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  The value returned is @p __result_first+N.
   */
   template<typename _InputIterator, typename _RandomAccessIterator>
-    _RandomAccessIterator
+    inline _RandomAccessIterator
     partial_sort_copy(_InputIterator __first, _InputIterator __last,
                      _RandomAccessIterator __result_first,
                      _RandomAccessIterator __result_last)
@@ -2018,27 +1729,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_valid_range(__first, __last);
       __glibcxx_requires_valid_range(__result_first, __result_last);
 
-      if (__result_first == __result_last)
-       return __result_last;
-      _RandomAccessIterator __result_real_last = __result_first;
-      while(__first != __last && __result_real_last != __result_last)
-       {
-         *__result_real_last = *__first;
-         ++__result_real_last;
-         ++__first;
-       }
-      std::make_heap(__result_first, __result_real_last);
-      while (__first != __last)
-       {
-         if (*__first < *__result_first)
-           std::__adjust_heap(__result_first, _DistanceType(0),
-                              _DistanceType(__result_real_last
-                                            - __result_first),
-                              _InputValueType(*__first));
-         ++__first;
-       }
-      std::sort_heap(__result_first, __result_real_last);
-      return __result_real_last;
+      return std::__partial_sort_copy(__first, __last,
+                                     __result_first, __result_last,
+                                     __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -2061,8 +1754,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @p __comp(*j,*i) is false.
    *  The value returned is @p __result_first+N.
   */
-  template<typename _InputIterator, typename _RandomAccessIterator, typename _Compare>
-    _RandomAccessIterator
+  template<typename _InputIterator, typename _RandomAccessIterator,
+          typename _Compare>
+    inline _RandomAccessIterator
     partial_sort_copy(_InputIterator __first, _InputIterator __last,
                      _RandomAccessIterator __result_first,
                      _RandomAccessIterator __result_last,
@@ -2088,46 +1782,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_valid_range(__first, __last);
       __glibcxx_requires_valid_range(__result_first, __result_last);
 
-      if (__result_first == __result_last)
-       return __result_last;
-      _RandomAccessIterator __result_real_last = __result_first;
-      while(__first != __last && __result_real_last != __result_last)
-       {
-         *__result_real_last = *__first;
-         ++__result_real_last;
-         ++__first;
-       }
-      std::make_heap(__result_first, __result_real_last, __comp);
-      while (__first != __last)
-       {
-         if (__comp(*__first, *__result_first))
-           std::__adjust_heap(__result_first, _DistanceType(0),
-                              _DistanceType(__result_real_last
-                                            - __result_first),
-                              _InputValueType(*__first),
-                              __comp);
-         ++__first;
-       }
-      std::sort_heap(__result_first, __result_real_last, __comp);
-      return __result_real_last;
-    }
-
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator>
-    void
-    __unguarded_linear_insert(_RandomAccessIterator __last)
-    {
-      typename iterator_traits<_RandomAccessIterator>::value_type
-       __val = _GLIBCXX_MOVE(*__last);
-      _RandomAccessIterator __next = __last;
-      --__next;
-      while (__val < *__next)
-       {
-         *__last = _GLIBCXX_MOVE(*__next);
-         __last = __next;
-         --__next;
-       }
-      *__last = _GLIBCXX_MOVE(__val);
+      return std::__partial_sort_copy(__first, __last,
+                                     __result_first, __result_last,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   /// This is a helper function for the sort routine.
@@ -2140,7 +1797,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        __val = _GLIBCXX_MOVE(*__last);
       _RandomAccessIterator __next = __last;
       --__next;
-      while (__comp(__val, *__next))
+      while (__comp(__val, __next))
        {
          *__last = _GLIBCXX_MOVE(*__next);
          __last = __next;
@@ -2149,29 +1806,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       *__last = _GLIBCXX_MOVE(__val);
     }
 
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator>
-    void
-    __insertion_sort(_RandomAccessIterator __first,
-                    _RandomAccessIterator __last)
-    {
-      if (__first == __last)
-       return;
-
-      for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-       {
-         if (*__i < *__first)
-           {
-             typename iterator_traits<_RandomAccessIterator>::value_type
-               __val = _GLIBCXX_MOVE(*__i);
-             _GLIBCXX_MOVE_BACKWARD3(__first, __i, __i + 1);
-             *__first = _GLIBCXX_MOVE(__val);
-           }
-         else
-           std::__unguarded_linear_insert(__i);
-       }
-    }
-
   /// This is a helper function for the sort routine.
   template<typename _RandomAccessIterator, typename _Compare>
     void
@@ -2182,7 +1816,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
        {
-         if (__comp(*__i, *__first))
+         if (__comp(__i, __first))
            {
              typename iterator_traits<_RandomAccessIterator>::value_type
                __val = _GLIBCXX_MOVE(*__i);
@@ -2190,34 +1824,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
              *__first = _GLIBCXX_MOVE(__val);
            }
          else
-           std::__unguarded_linear_insert(__i, __comp);
+           std::__unguarded_linear_insert(__i,
+                               __gnu_cxx::__ops::__val_comp_iter(__comp));
        }
     }
 
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator>
-    inline void
-    __unguarded_insertion_sort(_RandomAccessIterator __first,
-                              _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
-      for (_RandomAccessIterator __i = __first; __i != __last; ++__i)
-       std::__unguarded_linear_insert(__i);
-    }
-
   /// This is a helper function for the sort routine.
   template<typename _RandomAccessIterator, typename _Compare>
     inline void
     __unguarded_insertion_sort(_RandomAccessIterator __first,
                               _RandomAccessIterator __last, _Compare __comp)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       for (_RandomAccessIterator __i = __first; __i != __last; ++__i)
-       std::__unguarded_linear_insert(__i, __comp);
+       std::__unguarded_linear_insert(__i,
+                               __gnu_cxx::__ops::__val_comp_iter(__comp));
     }
 
   /**
@@ -2226,21 +1846,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   */
   enum { _S_threshold = 16 };
 
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator>
-    void
-    __final_insertion_sort(_RandomAccessIterator __first,
-                          _RandomAccessIterator __last)
-    {
-      if (__last - __first > int(_S_threshold))
-       {
-         std::__insertion_sort(__first, __first + int(_S_threshold));
-         std::__unguarded_insertion_sort(__first + int(_S_threshold), __last);
-       }
-      else
-       std::__insertion_sort(__first, __last);
-    }
-
   /// This is a helper function for the sort routine.
   template<typename _RandomAccessIterator, typename _Compare>
     void
@@ -2258,38 +1863,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 
   /// This is a helper function...
-  template<typename _RandomAccessIterator, typename _Tp>
-    _RandomAccessIterator
-    __unguarded_partition(_RandomAccessIterator __first,
-                         _RandomAccessIterator __last, const _Tp& __pivot)
-    {
-      while (true)
-       {
-         while (*__first < __pivot)
-           ++__first;
-         --__last;
-         while (__pivot < *__last)
-           --__last;
-         if (!(__first < __last))
-           return __first;
-         std::iter_swap(__first, __last);
-         ++__first;
-       }
-    }
-
-  /// This is a helper function...
-  template<typename _RandomAccessIterator, typename _Tp, typename _Compare>
+  template<typename _RandomAccessIterator, typename _Compare>
     _RandomAccessIterator
     __unguarded_partition(_RandomAccessIterator __first,
                          _RandomAccessIterator __last,
-                         const _Tp& __pivot, _Compare __comp)
+                         _RandomAccessIterator __pivot, _Compare __comp)
     {
       while (true)
        {
-         while (__comp(*__first, __pivot))
+         while (__comp(__first, __pivot))
            ++__first;
          --__last;
-         while (__comp(__pivot, *__last))
+         while (__comp(__pivot, __last))
            --__last;
          if (!(__first < __last))
            return __first;
@@ -2298,18 +1883,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        }
     }
 
-  /// This is a helper function...
-  template<typename _RandomAccessIterator>
-    inline _RandomAccessIterator
-    __unguarded_partition_pivot(_RandomAccessIterator __first,
-                               _RandomAccessIterator __last)
-    {
-      _RandomAccessIterator __mid = __first + (__last - __first) / 2;
-      std::__move_median_first(__first, __mid, (__last - 1));
-      return std::__unguarded_partition(__first + 1, __last, *__first);
-    }
-
-
   /// This is a helper function...
   template<typename _RandomAccessIterator, typename _Compare>
     inline _RandomAccessIterator
@@ -2317,30 +1890,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                                _RandomAccessIterator __last, _Compare __comp)
     {
       _RandomAccessIterator __mid = __first + (__last - __first) / 2;
-      std::__move_median_first(__first, __mid, (__last - 1), __comp);
-      return std::__unguarded_partition(__first + 1, __last, *__first, __comp);
+      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1,
+                                 __comp);
+      return std::__unguarded_partition(__first + 1, __last, __first, __comp);
     }
 
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator, typename _Size>
-    void
-    __introsort_loop(_RandomAccessIterator __first,
-                    _RandomAccessIterator __last,
-                    _Size __depth_limit)
+  template<typename _RandomAccessIterator, typename _Compare>
+    inline void
+    __partial_sort(_RandomAccessIterator __first,
+                  _RandomAccessIterator __middle,
+                  _RandomAccessIterator __last,
+                  _Compare __comp)
     {
-      while (__last - __first > int(_S_threshold))
-       {
-         if (__depth_limit == 0)
-           {
-             _GLIBCXX_STD_A::partial_sort(__first, __last, __last);
-             return;
-           }
-         --__depth_limit;
-         _RandomAccessIterator __cut =
-           std::__unguarded_partition_pivot(__first, __last);
-         std::__introsort_loop(__cut, __last, __depth_limit);
-         __last = __cut;
-       }
+      std::__heap_select(__first, __middle, __last, __comp);
+      std::__sort_heap(__first, __middle, __comp);
     }
 
   /// This is a helper function for the sort routine.
@@ -2354,7 +1917,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        {
          if (__depth_limit == 0)
            {
-             _GLIBCXX_STD_A::partial_sort(__first, __last, __last, __comp);
+             std::__partial_sort(__first, __last, __last, __comp);
              return;
            }
          --__depth_limit;
@@ -2367,33 +1930,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   // sort
 
-  template<typename _RandomAccessIterator, typename _Size>
-    void
-    __introselect(_RandomAccessIterator __first, _RandomAccessIterator __nth,
-                 _RandomAccessIterator __last, _Size __depth_limit)
+  template<typename _RandomAccessIterator, typename _Compare>
+    inline void
+    __sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
+          _Compare __comp)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
-      while (__last - __first > 3)
+      if (__first != __last)
        {
-         if (__depth_limit == 0)
-           {
-             std::__heap_select(__first, __nth + 1, __last);
-
-             // Place the nth largest element in its final position.
-             std::iter_swap(__first, __nth);
-             return;
-           }
-         --__depth_limit;
-         _RandomAccessIterator __cut =
-           std::__unguarded_partition_pivot(__first, __last);
-         if (__cut <= __nth)
-           __first = __cut;
-         else
-           __last = __cut;
+         std::__introsort_loop(__first, __last,
+                               std::__lg(__last - __first) * 2,
+                               __comp);
+         std::__final_insertion_sort(__first, __last, __comp);
        }
-      std::__insertion_sort(__first, __last);
     }
 
   template<typename _RandomAccessIterator, typename _Size, typename _Compare>
@@ -2402,9 +1950,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                  _RandomAccessIterator __last, _Size __depth_limit,
                  _Compare __comp)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       while (__last - __first > 3)
        {
          if (__depth_limit == 0)
@@ -2446,14 +1991,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  the function used for the initial sort.
   */
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    _ForwardIterator
+    inline _ForwardIterator
     lower_bound(_ForwardIterator __first, _ForwardIterator __last,
                const _Tp& __val, _Compare __comp)
     {
       typedef typename iterator_traits<_ForwardIterator>::value_type
        _ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-       _DistanceType;
 
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
@@ -2462,6 +2005,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_partitioned_lower_pred(__first, __last,
                                                __val, __comp);
 
+      return std::__lower_bound(__first, __last, __val,
+                               __gnu_cxx::__ops::__iter_comp_val(__comp));
+    }
+
+  template<typename _ForwardIterator, typename _Tp, typename _Compare>
+    _ForwardIterator
+    __upper_bound(_ForwardIterator __first, _ForwardIterator __last,
+                 const _Tp& __val, _Compare __comp)
+    {
+      typedef typename iterator_traits<_ForwardIterator>::difference_type
+       _DistanceType;
+
       _DistanceType __len = std::distance(__first, __last);
 
       while (__len > 0)
@@ -2469,14 +2024,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          _DistanceType __half = __len >> 1;
          _ForwardIterator __middle = __first;
          std::advance(__middle, __half);
-         if (__comp(*__middle, __val))
+         if (__comp(__val, __middle))
+           __len = __half;
+         else
            {
              __first = __middle;
              ++__first;
              __len = __len - __half - 1;
            }
-         else
-           __len = __half;
        }
       return __first;
     }
@@ -2493,37 +2048,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @ingroup binary_search_algorithms
   */
   template<typename _ForwardIterator, typename _Tp>
-    _ForwardIterator
+    inline _ForwardIterator
     upper_bound(_ForwardIterator __first, _ForwardIterator __last,
                const _Tp& __val)
     {
       typedef typename iterator_traits<_ForwardIterator>::value_type
        _ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-       _DistanceType;
 
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
       __glibcxx_requires_partitioned_upper(__first, __last, __val);
 
-      _DistanceType __len = std::distance(__first, __last);
-
-      while (__len > 0)
-       {
-         _DistanceType __half = __len >> 1;
-         _ForwardIterator __middle = __first;
-         std::advance(__middle, __half);
-         if (__val < *__middle)
-           __len = __half;
-         else
-           {
-             __first = __middle;
-             ++__first;
-             __len = __len - __half - 1;
-           }
-       }
-      return __first;
+      return std::__upper_bound(__first, __last, __val,
+                               __gnu_cxx::__ops::__val_less_iter());
     }
 
   /**
@@ -2542,14 +2080,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  the function used for the initial sort.
   */
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    _ForwardIterator
+    inline _ForwardIterator
     upper_bound(_ForwardIterator __first, _ForwardIterator __last,
                const _Tp& __val, _Compare __comp)
     {
       typedef typename iterator_traits<_ForwardIterator>::value_type
        _ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-       _DistanceType;
 
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
@@ -2558,6 +2094,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_partitioned_upper_pred(__first, __last,
                                                __val, __comp);
 
+      return std::__upper_bound(__first, __last, __val,
+                               __gnu_cxx::__ops::__val_comp_iter(__comp));
+    }
+
+  template<typename _ForwardIterator, typename _Tp,
+          typename _CompareItTp, typename _CompareTpIt>
+    pair<_ForwardIterator, _ForwardIterator>
+    __equal_range(_ForwardIterator __first, _ForwardIterator __last,
+                 const _Tp& __val,
+                 _CompareItTp __comp_it_val, _CompareTpIt __comp_val_it)
+    {
+      typedef typename iterator_traits<_ForwardIterator>::difference_type
+       _DistanceType;
+
       _DistanceType __len = std::distance(__first, __last);
 
       while (__len > 0)
@@ -2565,16 +2115,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          _DistanceType __half = __len >> 1;
          _ForwardIterator __middle = __first;
          std::advance(__middle, __half);
-         if (__comp(__val, *__middle))
-           __len = __half;
-         else
+         if (__comp_it_val(__middle, __val))
            {
              __first = __middle;
              ++__first;
              __len = __len - __half - 1;
            }
+         else if (__comp_val_it(__val, __middle))
+           __len = __half;
+         else
+           {
+             _ForwardIterator __left
+               = std::__lower_bound(__first, __middle, __val, __comp_it_val);
+             std::advance(__first, __len);
+             _ForwardIterator __right
+               = std::__upper_bound(++__middle, __first, __val, __comp_val_it);
+             return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
+           }
        }
-      return __first;
+      return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
     }
 
   /**
@@ -2595,48 +2154,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  but does not actually call those functions.
   */
   template<typename _ForwardIterator, typename _Tp>
-    pair<_ForwardIterator, _ForwardIterator>
+    inline pair<_ForwardIterator, _ForwardIterator>
     equal_range(_ForwardIterator __first, _ForwardIterator __last,
                const _Tp& __val)
     {
       typedef typename iterator_traits<_ForwardIterator>::value_type
        _ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-       _DistanceType;
 
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_LessThanOpConcept<_ValueType, _Tp>)
-      __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>) 
+      __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
       __glibcxx_requires_partitioned_lower(__first, __last, __val);
       __glibcxx_requires_partitioned_upper(__first, __last, __val);      
 
-      _DistanceType __len = std::distance(__first, __last);
-      while (__len > 0)
-       {
-         _DistanceType __half = __len >> 1;
-         _ForwardIterator __middle = __first;
-         std::advance(__middle, __half);
-         if (*__middle < __val)
-           {
-             __first = __middle;
-             ++__first;
-             __len = __len - __half - 1;
-           }
-         else if (__val < *__middle)
-           __len = __half;
-         else
-           {
-             _ForwardIterator __left = std::lower_bound(__first, __middle,
-                                                        __val);
-             std::advance(__first, __len);
-             _ForwardIterator __right = std::upper_bound(++__middle, __first,
-                                                         __val);
-             return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
-           }
-       }
-      return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
+      return std::__equal_range(__first, __last, __val,
+                               __gnu_cxx::__ops::__iter_less_val(),
+                               __gnu_cxx::__ops::__val_less_iter());
     }
 
   /**
@@ -2657,14 +2191,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  but does not actually call those functions.
   */
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    pair<_ForwardIterator, _ForwardIterator>
+    inline pair<_ForwardIterator, _ForwardIterator>
     equal_range(_ForwardIterator __first, _ForwardIterator __last,
                const _Tp& __val, _Compare __comp)
     {
       typedef typename iterator_traits<_ForwardIterator>::value_type
        _ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-       _DistanceType;
 
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
@@ -2677,32 +2209,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_partitioned_upper_pred(__first, __last,
                                                __val, __comp);
 
-      _DistanceType __len = std::distance(__first, __last);
-
-      while (__len > 0)
-       {
-         _DistanceType __half = __len >> 1;
-         _ForwardIterator __middle = __first;
-         std::advance(__middle, __half);
-         if (__comp(*__middle, __val))
-           {
-             __first = __middle;
-             ++__first;
-             __len = __len - __half - 1;
-           }
-         else if (__comp(__val, *__middle))
-           __len = __half;
-         else
-           {
-             _ForwardIterator __left = std::lower_bound(__first, __middle,
-                                                        __val, __comp);
-             std::advance(__first, __len);
-             _ForwardIterator __right = std::upper_bound(++__middle, __first,
-                                                         __val, __comp);
-             return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
-           }
-       }
-      return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
+      return std::__equal_range(__first, __last, __val,
+                               __gnu_cxx::__ops::__iter_comp_val(__comp),
+                               __gnu_cxx::__ops::__val_comp_iter(__comp));
     }
 
   /**
@@ -2731,7 +2240,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_partitioned_lower(__first, __last, __val);
       __glibcxx_requires_partitioned_upper(__first, __last, __val);
 
-      _ForwardIterator __i = std::lower_bound(__first, __last, __val);
+      _ForwardIterator __i
+       = std::__lower_bound(__first, __last, __val,
+                            __gnu_cxx::__ops::__iter_less_val());
       return __i != __last && !(__val < *__i);
     }
 
@@ -2767,38 +2278,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __glibcxx_requires_partitioned_upper_pred(__first, __last,
                                                __val, __comp);
 
-      _ForwardIterator __i = std::lower_bound(__first, __last, __val, __comp);
+      _ForwardIterator __i
+       = std::__lower_bound(__first, __last, __val,
+                            __gnu_cxx::__ops::__iter_comp_val(__comp));
       return __i != __last && !bool(__comp(__val, *__i));
     }
 
   // merge
 
-  /// This is a helper function for the __merge_adaptive routines.
-  template<typename _InputIterator1, typename _InputIterator2,
-          typename _OutputIterator>
-    void
-    __move_merge_adaptive(_InputIterator1 __first1, _InputIterator1 __last1,
-                         _InputIterator2 __first2, _InputIterator2 __last2,
-                         _OutputIterator __result)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-       {
-         if (*__first2 < *__first1)
-           {
-             *__result = _GLIBCXX_MOVE(*__first2);
-             ++__first2;
-           }
-         else
-           {
-             *__result = _GLIBCXX_MOVE(*__first1);
-             ++__first1;
-           }
-         ++__result;
-       }
-      if (__first1 != __last1)
-       _GLIBCXX_MOVE3(__first1, __last1, __result);
-    }
-
   /// This is a helper function for the __merge_adaptive routines.
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator, typename _Compare>
@@ -2809,7 +2296,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       while (__first1 != __last1 && __first2 != __last2)
        {
-         if (__comp(*__first2, *__first1))
+         if (__comp(__first2, __first1))
            {
              *__result = _GLIBCXX_MOVE(*__first2);
              ++__first2;
@@ -2825,48 +2312,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        _GLIBCXX_MOVE3(__first1, __last1, __result);
     }
 
-  /// This is a helper function for the __merge_adaptive routines.
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-          typename _BidirectionalIterator3>
-    void
-    __move_merge_adaptive_backward(_BidirectionalIterator1 __first1,
-                                  _BidirectionalIterator1 __last1,
-                                  _BidirectionalIterator2 __first2,
-                                  _BidirectionalIterator2 __last2,
-                                  _BidirectionalIterator3 __result)
-    {
-      if (__first1 == __last1)
-       {
-         _GLIBCXX_MOVE_BACKWARD3(__first2, __last2, __result);
-         return;
-       }
-      else if (__first2 == __last2)
-       return;
-
-      --__last1;
-      --__last2;
-      while (true)
-       {
-         if (*__last2 < *__last1)
-           {
-             *--__result = _GLIBCXX_MOVE(*__last1);
-             if (__first1 == __last1)
-               {
-                 _GLIBCXX_MOVE_BACKWARD3(__first2, ++__last2, __result);
-                 return;
-               }
-             --__last1;
-           }
-         else
-           {
-             *--__result = _GLIBCXX_MOVE(*__last2);
-             if (__first2 == __last2)
-               return;
-             --__last2;
-           }
-       }
-    }
-
   /// This is a helper function for the __merge_adaptive routines.
   template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
           typename _BidirectionalIterator3, typename _Compare>
@@ -2890,7 +2335,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       --__last2;
       while (true)
        {
-         if (__comp(*__last2, *__last1))
+         if (__comp(__last2, __last1))
            {
              *--__result = _GLIBCXX_MOVE(*__last1);
              if (__first1 == __last1)
@@ -2952,62 +2397,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        }
     }
 
-  /// This is a helper function for the merge routines.
-  template<typename _BidirectionalIterator, typename _Distance,
-          typename _Pointer>
-    void
-    __merge_adaptive(_BidirectionalIterator __first,
-                     _BidirectionalIterator __middle,
-                    _BidirectionalIterator __last,
-                    _Distance __len1, _Distance __len2,
-                    _Pointer __buffer, _Distance __buffer_size)
-    {
-      if (__len1 <= __len2 && __len1 <= __buffer_size)
-       {
-         _Pointer __buffer_end = _GLIBCXX_MOVE3(__first, __middle, __buffer);
-         std::__move_merge_adaptive(__buffer, __buffer_end, __middle, __last,
-                                    __first);
-       }
-      else if (__len2 <= __buffer_size)
-       {
-         _Pointer __buffer_end = _GLIBCXX_MOVE3(__middle, __last, __buffer);
-         std::__move_merge_adaptive_backward(__first, __middle, __buffer,
-                                             __buffer_end, __last);
-       }
-      else
-       {
-         _BidirectionalIterator __first_cut = __first;
-         _BidirectionalIterator __second_cut = __middle;
-         _Distance __len11 = 0;
-         _Distance __len22 = 0;
-         if (__len1 > __len2)
-           {
-             __len11 = __len1 / 2;
-             std::advance(__first_cut, __len11);
-             __second_cut = std::lower_bound(__middle, __last,
-                                             *__first_cut);
-             __len22 = std::distance(__middle, __second_cut);
-           }
-         else
-           {
-             __len22 = __len2 / 2;
-             std::advance(__second_cut, __len22);
-             __first_cut = std::upper_bound(__first, __middle,
-                                            *__second_cut);
-             __len11 = std::distance(__first, __first_cut);
-           }
-         _BidirectionalIterator __new_middle =
-           std::__rotate_adaptive(__first_cut, __middle, __second_cut,
-                                  __len1 - __len11, __len22, __buffer,
-                                  __buffer_size);
-         std::__merge_adaptive(__first, __first_cut, __new_middle, __len11,
-                               __len22, __buffer, __buffer_size);
-         std::__merge_adaptive(__new_middle, __second_cut, __last,
-                               __len1 - __len11,
-                               __len2 - __len22, __buffer, __buffer_size);
-       }
-    }
-
   /// This is a helper function for the merge routines.
   template<typename _BidirectionalIterator, typename _Distance, 
           typename _Pointer, typename _Compare>
@@ -3041,22 +2430,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            {
              __len11 = __len1 / 2;
              std::advance(__first_cut, __len11);
-             __second_cut = std::lower_bound(__middle, __last, *__first_cut,
-                                             __comp);
+             __second_cut
+               = std::__lower_bound(__middle, __last, *__first_cut,
+                                    __gnu_cxx::__ops::__iter_comp_val(__comp));
              __len22 = std::distance(__middle, __second_cut);
            }
          else
            {
              __len22 = __len2 / 2;
              std::advance(__second_cut, __len22);
-             __first_cut = std::upper_bound(__first, __middle, *__second_cut,
-                                            __comp);
+             __first_cut
+               = std::__upper_bound(__first, __middle, *__second_cut,
+                                    __gnu_cxx::__ops::__val_comp_iter(__comp));
              __len11 = std::distance(__first, __first_cut);
            }
-         _BidirectionalIterator __new_middle =
-           std::__rotate_adaptive(__first_cut, __middle, __second_cut,
-                                  __len1 - __len11, __len22, __buffer,
-                                  __buffer_size);
+
+         _BidirectionalIterator __new_middle
+           = std::__rotate_adaptive(__first_cut, __middle, __second_cut,
+                                    __len1 - __len11, __len22, __buffer,
+                                    __buffer_size);
          std::__merge_adaptive(__first, __first_cut, __new_middle, __len11,
                                __len22, __buffer, __buffer_size, __comp);
          std::__merge_adaptive(__new_middle, __second_cut, __last,
@@ -3066,49 +2458,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        }
     }
 
-  /// This is a helper function for the merge routines.
-  template<typename _BidirectionalIterator, typename _Distance>
-    void
-    __merge_without_buffer(_BidirectionalIterator __first,
-                          _BidirectionalIterator __middle,
-                          _BidirectionalIterator __last,
-                          _Distance __len1, _Distance __len2)
-    {
-      if (__len1 == 0 || __len2 == 0)
-       return;
-      if (__len1 + __len2 == 2)
-       {
-         if (*__middle < *__first)
-           std::iter_swap(__first, __middle);
-         return;
-       }
-      _BidirectionalIterator __first_cut = __first;
-      _BidirectionalIterator __second_cut = __middle;
-      _Distance __len11 = 0;
-      _Distance __len22 = 0;
-      if (__len1 > __len2)
-       {
-         __len11 = __len1 / 2;
-         std::advance(__first_cut, __len11);
-         __second_cut = std::lower_bound(__middle, __last, *__first_cut);
-         __len22 = std::distance(__middle, __second_cut);
-       }
-      else
-       {
-         __len22 = __len2 / 2;
-         std::advance(__second_cut, __len22);
-         __first_cut = std::upper_bound(__first, __middle, *__second_cut);
-         __len11 = std::distance(__first, __first_cut);
-       }
-      std::rotate(__first_cut, __middle, __second_cut);
-      _BidirectionalIterator __new_middle = __first_cut;
-      std::advance(__new_middle, std::distance(__middle, __second_cut));
-      std::__merge_without_buffer(__first, __first_cut, __new_middle,
-                                 __len11, __len22);
-      std::__merge_without_buffer(__new_middle, __second_cut, __last,
-                                 __len1 - __len11, __len2 - __len22);
-    }
-
   /// This is a helper function for the merge routines.
   template<typename _BidirectionalIterator, typename _Distance,
           typename _Compare>
@@ -3121,12 +2470,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       if (__len1 == 0 || __len2 == 0)
        return;
+
       if (__len1 + __len2 == 2)
        {
-         if (__comp(*__middle, *__first))
+         if (__comp(__middle, __first))
            std::iter_swap(__first, __middle);
          return;
        }
+
       _BidirectionalIterator __first_cut = __first;
       _BidirectionalIterator __second_cut = __middle;
       _Distance __len11 = 0;
@@ -3135,18 +2486,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        {
          __len11 = __len1 / 2;
          std::advance(__first_cut, __len11);
-         __second_cut = std::lower_bound(__middle, __last, *__first_cut,
-                                         __comp);
+         __second_cut
+           = std::__lower_bound(__middle, __last, *__first_cut,
+                                __gnu_cxx::__ops::__iter_comp_val(__comp));
          __len22 = std::distance(__middle, __second_cut);
        }
       else
        {
          __len22 = __len2 / 2;
          std::advance(__second_cut, __len22);
-         __first_cut = std::upper_bound(__first, __middle, *__second_cut,
-                                        __comp);
+         __first_cut
+           = std::__upper_bound(__first, __middle, *__second_cut,
+                                __gnu_cxx::__ops::__val_comp_iter(__comp));
          __len11 = std::distance(__first, __first_cut);
        }
+
       std::rotate(__first_cut, __middle, __second_cut);
       _BidirectionalIterator __new_middle = __first_cut;
       std::advance(__new_middle, std::distance(__middle, __second_cut));
@@ -3156,6 +2510,36 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                                  __len1 - __len11, __len2 - __len22, __comp);
     }
 
+  template<typename _BidirectionalIterator, typename _Compare>
+    void
+    __inplace_merge(_BidirectionalIterator __first,
+                   _BidirectionalIterator __middle,
+                   _BidirectionalIterator __last,
+                   _Compare __comp)
+    {
+      typedef typename iterator_traits<_BidirectionalIterator>::value_type
+          _ValueType;
+      typedef typename iterator_traits<_BidirectionalIterator>::difference_type
+          _DistanceType;
+
+      if (__first == __middle || __middle == __last)
+       return;
+
+      const _DistanceType __len1 = std::distance(__first, __middle);
+      const _DistanceType __len2 = std::distance(__middle, __last);
+
+      typedef _Temporary_buffer<_BidirectionalIterator, _ValueType> _TmpBuf;
+      _TmpBuf __buf(__first, __last);
+
+      if (__buf.begin() == 0)
+       std::__merge_without_buffer
+         (__first, __middle, __last, __len1, __len2, __comp);
+      else
+       std::__merge_adaptive
+         (__first, __middle, __last, __len1, __len2, __buf.begin(),
+          _DistanceType(__buf.size()), __comp);
+    }
+
   /**
    *  @brief Merges two sorted ranges in place.
    *  @ingroup sorting_algorithms
@@ -3175,36 +2559,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  distance(__first,__last).
   */
   template<typename _BidirectionalIterator>
-    void
+    inline void
     inplace_merge(_BidirectionalIterator __first,
                  _BidirectionalIterator __middle,
                  _BidirectionalIterator __last)
     {
-      typedef typename iterator_traits<_BidirectionalIterator>::value_type
-          _ValueType;
-      typedef typename iterator_traits<_BidirectionalIterator>::difference_type
-          _DistanceType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
            _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
+           typename iterator_traits<_BidirectionalIterator>::value_type>)
       __glibcxx_requires_sorted(__first, __middle);
       __glibcxx_requires_sorted(__middle, __last);
 
-      if (__first == __middle || __middle == __last)
-       return;
-
-      _DistanceType __len1 = std::distance(__first, __middle);
-      _DistanceType __len2 = std::distance(__middle, __last);
-
-      _Temporary_buffer<_BidirectionalIterator, _ValueType> __buf(__first,
-                                                                 __last);
-      if (__buf.begin() == 0)
-       std::__merge_without_buffer(__first, __middle, __last, __len1, __len2);
-      else
-       std::__merge_adaptive(__first, __middle, __last, __len1, __len2,
-                             __buf.begin(), _DistanceType(__buf.size()));
+      std::__inplace_merge(__first, __middle, __last,
+                          __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -3230,54 +2599,37 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  the function used for the initial sort.
   */
   template<typename _BidirectionalIterator, typename _Compare>
-    void
+    inline void
     inplace_merge(_BidirectionalIterator __first,
                  _BidirectionalIterator __middle,
                  _BidirectionalIterator __last,
                  _Compare __comp)
     {
-      typedef typename iterator_traits<_BidirectionalIterator>::value_type
-          _ValueType;
-      typedef typename iterator_traits<_BidirectionalIterator>::difference_type
-          _DistanceType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
            _BidirectionalIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-           _ValueType, _ValueType>)
+           typename iterator_traits<_BidirectionalIterator>::value_type,
+           typename iterator_traits<_BidirectionalIterator>::value_type>)
       __glibcxx_requires_sorted_pred(__first, __middle, __comp);
       __glibcxx_requires_sorted_pred(__middle, __last, __comp);
 
-      if (__first == __middle || __middle == __last)
-       return;
-
-      const _DistanceType __len1 = std::distance(__first, __middle);
-      const _DistanceType __len2 = std::distance(__middle, __last);
-
-      _Temporary_buffer<_BidirectionalIterator, _ValueType> __buf(__first,
-                                                                 __last);
-      if (__buf.begin() == 0)
-       std::__merge_without_buffer(__first, __middle, __last, __len1,
-                                   __len2, __comp);
-      else
-       std::__merge_adaptive(__first, __middle, __last, __len1, __len2,
-                             __buf.begin(), _DistanceType(__buf.size()),
-                             __comp);
+      std::__inplace_merge(__first, __middle, __last,
+                          __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
 
   /// This is a helper function for the __merge_sort_loop routines.
-  template<typename _InputIterator1, typename _InputIterator2,
-          typename _OutputIterator>
+  template<typename _InputIterator, typename _OutputIterator,
+          typename _Compare>
     _OutputIterator
-    __move_merge(_InputIterator1 __first1, _InputIterator1 __last1,
-                _InputIterator2 __first2, _InputIterator2 __last2,
-                _OutputIterator __result)
+    __move_merge(_InputIterator __first1, _InputIterator __last1,
+                _InputIterator __first2, _InputIterator __last2,
+                _OutputIterator __result, _Compare __comp)
     {
       while (__first1 != __last1 && __first2 != __last2)
        {
-         if (*__first2 < *__first1)
+         if (__comp(__first2, __first1))
            {
              *__result = _GLIBCXX_MOVE(*__first2);
              ++__first2;
@@ -3294,56 +2646,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                                           __result));
     }
 
-  /// This is a helper function for the __merge_sort_loop routines.
-  template<typename _InputIterator1, typename _InputIterator2,
-          typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    __move_merge(_InputIterator1 __first1, _InputIterator1 __last1,
-                _InputIterator2 __first2, _InputIterator2 __last2,
-                _OutputIterator __result, _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-       {
-         if (__comp(*__first2, *__first1))
-           {
-             *__result = _GLIBCXX_MOVE(*__first2);
-             ++__first2;
-           }
-         else
-           {
-             *__result = _GLIBCXX_MOVE(*__first1);
-             ++__first1;
-           }
-         ++__result;
-       }
-      return _GLIBCXX_MOVE3(__first2, __last2,
-                           _GLIBCXX_MOVE3(__first1, __last1,
-                                          __result));
-    }
-
-  template<typename _RandomAccessIterator1, typename _RandomAccessIterator2,
-          typename _Distance>
-    void
-    __merge_sort_loop(_RandomAccessIterator1 __first,
-                     _RandomAccessIterator1 __last,
-                     _RandomAccessIterator2 __result,
-                     _Distance __step_size)
-    {
-      const _Distance __two_step = 2 * __step_size;
-
-      while (__last - __first >= __two_step)
-       {
-         __result = std::__move_merge(__first, __first + __step_size,
-                                      __first + __step_size,
-                                      __first + __two_step, __result);
-         __first += __two_step;
-       }
-
-      __step_size = std::min(_Distance(__last - __first), __step_size);
-      std::__move_merge(__first, __first + __step_size,
-                       __first + __step_size, __last, __result);
-    }
-
   template<typename _RandomAccessIterator1, typename _RandomAccessIterator2,
           typename _Distance, typename _Compare>
     void
@@ -3364,24 +2666,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        }
       __step_size = std::min(_Distance(__last - __first), __step_size);
 
-      std::__move_merge(__first,__first + __step_size,
+      std::__move_merge(__first, __first + __step_size,
                        __first + __step_size, __last, __result, __comp);
     }
 
-  template<typename _RandomAccessIterator, typename _Distance>
-    void
-    __chunk_insertion_sort(_RandomAccessIterator __first,
-                          _RandomAccessIterator __last,
-                          _Distance __chunk_size)
-    {
-      while (__last - __first >= __chunk_size)
-       {
-         std::__insertion_sort(__first, __first + __chunk_size);
-         __first += __chunk_size;
-       }
-      std::__insertion_sort(__first, __last);
-    }
-
   template<typename _RandomAccessIterator, typename _Distance,
           typename _Compare>
     void
@@ -3399,30 +2687,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   enum { _S_chunk_size = 7 };
 
-  template<typename _RandomAccessIterator, typename _Pointer>
-    void
-    __merge_sort_with_buffer(_RandomAccessIterator __first,
-                            _RandomAccessIterator __last,
-                             _Pointer __buffer)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-       _Distance;
-
-      const _Distance __len = __last - __first;
-      const _Pointer __buffer_last = __buffer + __len;
-
-      _Distance __step_size = _S_chunk_size;
-      std::__chunk_insertion_sort(__first, __last, __step_size);
-
-      while (__step_size < __len)
-       {
-         std::__merge_sort_loop(__first, __last, __buffer, __step_size);
-         __step_size *= 2;
-         std::__merge_sort_loop(__buffer, __buffer_last, __first, __step_size);
-         __step_size *= 2;
-       }
-    }
-
   template<typename _RandomAccessIterator, typename _Pointer, typename _Compare>
     void
     __merge_sort_with_buffer(_RandomAccessIterator __first,
@@ -3449,33 +2713,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        }
     }
 
-  template<typename _RandomAccessIterator, typename _Pointer,
-          typename _Distance>
-    void
-    __stable_sort_adaptive(_RandomAccessIterator __first,
-                          _RandomAccessIterator __last,
-                           _Pointer __buffer, _Distance __buffer_size)
-    {
-      const _Distance __len = (__last - __first + 1) / 2;
-      const _RandomAccessIterator __middle = __first + __len;
-      if (__len > __buffer_size)
-       {
-         std::__stable_sort_adaptive(__first, __middle,
-                                     __buffer, __buffer_size);
-         std::__stable_sort_adaptive(__middle, __last,
-                                     __buffer, __buffer_size);
-       }
-      else
-       {
-         std::__merge_sort_with_buffer(__first, __middle, __buffer);
-         std::__merge_sort_with_buffer(__middle, __last, __buffer);
-       }
-      std::__merge_adaptive(__first, __middle, __last,
-                           _Distance(__middle - __first),
-                           _Distance(__last - __middle),
-                           __buffer, __buffer_size);
-    }
-
   template<typename _RandomAccessIterator, typename _Pointer,
           typename _Distance, typename _Compare>
     void
@@ -3505,25 +2742,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                            __comp);
     }
 
-  /// This is a helper function for the stable sorting routines.
-  template<typename _RandomAccessIterator>
-    void
-    __inplace_stable_sort(_RandomAccessIterator __first,
-                         _RandomAccessIterator __last)
-    {
-      if (__last - __first < 15)
-       {
-         std::__insertion_sort(__first, __last);
-         return;
-       }
-      _RandomAccessIterator __middle = __first + (__last - __first) / 2;
-      std::__inplace_stable_sort(__first, __middle);
-      std::__inplace_stable_sort(__middle, __last);
-      std::__merge_without_buffer(__first, __middle, __last,
-                                 __middle - __first,
-                                 __last - __middle);
-    }
-
   /// This is a helper function for the stable sorting routines.
   template<typename _RandomAccessIterator, typename _Compare>
     void
@@ -3551,6 +2769,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   // that their input ranges are sorted and the postcondition that their output
   // ranges are sorted.
 
+  template<typename _InputIterator1, typename _InputIterator2,
+          typename _Compare>
+    bool
+    __includes(_InputIterator1 __first1, _InputIterator1 __last1,
+              _InputIterator2 __first2, _InputIterator2 __last2,
+              _Compare __comp)
+    {
+      while (__first1 != __last1 && __first2 != __last2)
+       if (__comp(__first2, __first1))
+         return false;
+       else if (__comp(__first1, __first2))
+         ++__first1;
+       else
+         ++__first1, ++__first2;
+
+      return __first2 == __last2;
+    }
+
   /**
    *  @brief Determines whether all elements of a sequence exists in a range.
    *  @param  __first1  Start of search range.
@@ -3570,32 +2806,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  returned.
   */
   template<typename _InputIterator1, typename _InputIterator2>
-    bool
+    inline bool
     includes(_InputIterator1 __first1, _InputIterator1 __last1,
             _InputIterator2 __first2, _InputIterator2 __last2)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType1, _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set(__first1, __last1, __first2);
       __glibcxx_requires_sorted_set(__first2, __last2, __first1);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       if (*__first2 < *__first1)
-         return false;
-       else if(*__first1 < *__first2)
-         ++__first1;
-       else
-         ++__first1, ++__first2;
-
-      return __first2 == __last2;
+      return std::__includes(__first1, __last1, __first2, __last2,
+                            __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -3621,35 +2849,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _Compare>
-    bool
+    inline bool
     includes(_InputIterator1 __first1, _InputIterator1 __last1,
             _InputIterator2 __first2, _InputIterator2 __last2,
             _Compare __comp)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType1, _ValueType2>)
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
       __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       if (__comp(*__first2, *__first1))
-         return false;
-       else if(__comp(*__first1, *__first2))
-         ++__first1;
-       else
-         ++__first1, ++__first2;
-
-      return __first2 == __last2;
+      return std::__includes(__first1, __last1, __first2, __last2,
+                            __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   // nth_element
@@ -3662,30 +2880,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   // min_element
   // max_element
 
-  /**
-   *  @brief  Permute range into the next @e dictionary ordering.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  False if wrapped to first permutation, true otherwise.
-   *
-   *  Treats all permutations of the range as a set of @e dictionary sorted
-   *  sequences.  Permutes the current sequence into the next one of this set.
-   *  Returns true if there are more sequences to generate.  If the sequence
-   *  is the largest of the set, the smallest is generated and false returned.
-  */
-  template<typename _BidirectionalIterator>
+  template<typename _BidirectionalIterator, typename _Compare>
     bool
-    next_permutation(_BidirectionalIterator __first,
-                    _BidirectionalIterator __last)
+    __next_permutation(_BidirectionalIterator __first,
+                      _BidirectionalIterator __last, _Compare __comp)
     {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-                                 _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-           typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
       if (__first == __last)
        return false;
       _BidirectionalIterator __i = __first;
@@ -3699,23 +2898,53 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        {
          _BidirectionalIterator __ii = __i;
          --__i;
-         if (*__i < *__ii)
+         if (__comp(__i, __ii))
            {
              _BidirectionalIterator __j = __last;
-             while (!(*__i < *--__j))
+             while (!__comp(__i, --__j))
                {}
              std::iter_swap(__i, __j);
-             std::reverse(__ii, __last);
+             std::__reverse(__ii, __last,
+                            std::__iterator_category(__first));
              return true;
            }
          if (__i == __first)
            {
-             std::reverse(__first, __last);
+             std::__reverse(__first, __last,
+                            std::__iterator_category(__first));
              return false;
            }
        }
     }
 
+  /**
+   *  @brief  Permute range into the next @e dictionary ordering.
+   *  @ingroup sorting_algorithms
+   *  @param  __first  Start of range.
+   *  @param  __last   End of range.
+   *  @return  False if wrapped to first permutation, true otherwise.
+   *
+   *  Treats all permutations of the range as a set of @e dictionary sorted
+   *  sequences.  Permutes the current sequence into the next one of this set.
+   *  Returns true if there are more sequences to generate.  If the sequence
+   *  is the largest of the set, the smallest is generated and false returned.
+  */
+  template<typename _BidirectionalIterator>
+    inline bool
+    next_permutation(_BidirectionalIterator __first,
+                    _BidirectionalIterator __last)
+    {
+      // concept requirements
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<
+                                 _BidirectionalIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
+           typename iterator_traits<_BidirectionalIterator>::value_type>)
+      __glibcxx_requires_valid_range(__first, __last);
+
+      return std::__next_permutation
+       (__first, __last, __gnu_cxx::__ops::__iter_less_iter());
+    }
+
   /**
    *  @brief  Permute range into the next @e dictionary ordering using
    *          comparison functor.
@@ -3732,7 +2961,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  smallest is generated and false returned.
   */
   template<typename _BidirectionalIterator, typename _Compare>
-    bool
+    inline bool
     next_permutation(_BidirectionalIterator __first,
                     _BidirectionalIterator __last, _Compare __comp)
     {
@@ -3744,6 +2973,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_BidirectionalIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
+      return std::__next_permutation
+       (__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__comp));
+    }
+
+  template<typename _BidirectionalIterator, typename _Compare>
+    bool
+    __prev_permutation(_BidirectionalIterator __first,
+                      _BidirectionalIterator __last, _Compare __comp)
+    {
       if (__first == __last)
        return false;
       _BidirectionalIterator __i = __first;
@@ -3757,18 +2995,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        {
          _BidirectionalIterator __ii = __i;
          --__i;
-         if (__comp(*__i, *__ii))
+         if (__comp(__ii, __i))
            {
              _BidirectionalIterator __j = __last;
-             while (!bool(__comp(*__i, *--__j)))
+             while (!__comp(--__j, __i))
                {}
              std::iter_swap(__i, __j);
-             std::reverse(__ii, __last);
+             std::__reverse(__ii, __last,
+                            std::__iterator_category(__first));
              return true;
            }
          if (__i == __first)
            {
-             std::reverse(__first, __last);
+             std::__reverse(__first, __last,
+                            std::__iterator_category(__first));
              return false;
            }
        }
@@ -3788,7 +3028,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  returned.
   */
   template<typename _BidirectionalIterator>
-    bool
+    inline bool
     prev_permutation(_BidirectionalIterator __first,
                     _BidirectionalIterator __last)
     {
@@ -3799,34 +3039,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_BidirectionalIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last)
-       return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-       return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-       {
-         _BidirectionalIterator __ii = __i;
-         --__i;
-         if (*__ii < *__i)
-           {
-             _BidirectionalIterator __j = __last;
-             while (!(*--__j < *__i))
-               {}
-             std::iter_swap(__i, __j);
-             std::reverse(__ii, __last);
-             return true;
-           }
-         if (__i == __first)
-           {
-             std::reverse(__first, __last);
-             return false;
-           }
-       }
+      return std::__prev_permutation(__first, __last,
+                                    __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -3845,7 +3059,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  the largest is generated and false returned.
   */
   template<typename _BidirectionalIterator, typename _Compare>
-    bool
+    inline bool
     prev_permutation(_BidirectionalIterator __first,
                     _BidirectionalIterator __last, _Compare __comp)
     {
@@ -3857,39 +3071,28 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_BidirectionalIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last)
-       return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-       return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-       {
-         _BidirectionalIterator __ii = __i;
-         --__i;
-         if (__comp(*__ii, *__i))
-           {
-             _BidirectionalIterator __j = __last;
-             while (!bool(__comp(*--__j, *__i)))
-               {}
-             std::iter_swap(__i, __j);
-             std::reverse(__ii, __last);
-             return true;
-           }
-         if (__i == __first)
-           {
-             std::reverse(__first, __last);
-             return false;
-           }
-       }
+      return std::__prev_permutation(__first, __last,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   // replace
   // replace_if
 
+  template<typename _InputIterator, typename _OutputIterator,
+          typename _Predicate, typename _Tp>
+    _OutputIterator
+    __replace_copy_if(_InputIterator __first, _InputIterator __last,
+                     _OutputIterator __result,
+                     _Predicate __pred, const _Tp& __new_value)
+    {
+      for (; __first != __last; ++__first, ++__result)
+       if (__pred(__first))
+         *__result = __new_value;
+       else
+         *__result = *__first;
+      return __result;
+    }
+
   /**
    *  @brief Copy a sequence, replacing each element of one value with another
    *         value.
@@ -3905,7 +3108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  equal to @p __old_value with @p __new_value.
   */
   template<typename _InputIterator, typename _OutputIterator, typename _Tp>
-    _OutputIterator
+    inline _OutputIterator
     replace_copy(_InputIterator __first, _InputIterator __last,
                 _OutputIterator __result,
                 const _Tp& __old_value, const _Tp& __new_value)
@@ -3918,12 +3121,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_InputIterator>::value_type, _Tp>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      for (; __first != __last; ++__first, ++__result)
-       if (*__first == __old_value)
-         *__result = __new_value;
-       else
-         *__result = *__first;
-      return __result;
+      return std::__replace_copy_if(__first, __last, __result,
+                       __gnu_cxx::__ops::__iter_equals_val(__old_value),
+                                             __new_value);
     }
 
   /**
@@ -3943,7 +3143,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   */
   template<typename _InputIterator, typename _OutputIterator,
           typename _Predicate, typename _Tp>
-    _OutputIterator
+    inline _OutputIterator
     replace_copy_if(_InputIterator __first, _InputIterator __last,
                    _OutputIterator __result,
                    _Predicate __pred, const _Tp& __new_value)
@@ -3956,15 +3156,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_InputIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      for (; __first != __last; ++__first, ++__result)
-       if (__pred(*__first))
-         *__result = __new_value;
-       else
-         *__result = *__first;
-      return __result;
+      return std::__replace_copy_if(__first, __last, __result,
+                               __gnu_cxx::__ops::__pred_iter(__pred),
+                                             __new_value);
+    }
+
+  template<typename _InputIterator, typename _Predicate>
+    typename iterator_traits<_InputIterator>::difference_type
+    __count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
+    {
+      typename iterator_traits<_InputIterator>::difference_type __n = 0;
+      for (; __first != __last; ++__first)
+       if (__pred(__first))
+         ++__n;
+      return __n;
     }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
   /**
    *  @brief  Determines whether the elements of a sequence are sorted.
    *  @ingroup sorting_algorithms
@@ -3992,6 +3200,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
              _Compare __comp)
     { return std::is_sorted_until(__first, __last, __comp) == __last; }
 
+  template<typename _ForwardIterator, typename _Compare>
+    _ForwardIterator
+    __is_sorted_until(_ForwardIterator __first, _ForwardIterator __last,
+                     _Compare __comp)
+    {
+      if (__first == __last)
+       return __last;
+
+      _ForwardIterator __next = __first;
+      for (++__next; __next != __last; __first = __next, ++__next)
+       if (__comp(__next, __first))
+         return __next;
+      return __next;
+    }
+
   /**
    *  @brief  Determines the end of a sorted sequence.
    *  @ingroup sorting_algorithms
@@ -4001,7 +3224,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *           for which the range [__first, i) is sorted.
   */
   template<typename _ForwardIterator>
-    _ForwardIterator
+    inline _ForwardIterator
     is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
@@ -4010,14 +3233,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last)
-       return __last;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next)
-       if (*__next < *__first)
-         return __next;
-      return __next;
+      return std::__is_sorted_until(__first, __last,
+                                   __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -4030,7 +3247,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *           for which the range [__first, i) is sorted.
   */
   template<typename _ForwardIterator, typename _Compare>
-    _ForwardIterator
+    inline _ForwardIterator
     is_sorted_until(_ForwardIterator __first, _ForwardIterator __last,
                    _Compare __comp)
     {
@@ -4041,14 +3258,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last)
-       return __last;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next)
-       if (__comp(*__next, *__first))
-         return __next;
-      return __next;
+      return std::__is_sorted_until(__first, __last,
+                                   __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   /**
@@ -4087,34 +3298,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                              : pair<const _Tp&, const _Tp&>(__a, __b);
     }
 
-  /**
-   *  @brief  Return a pair of iterators pointing to the minimum and maximum
-   *          elements in a range.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  make_pair(m, M), where m is the first iterator i in 
-   *           [__first, __last) such that no other element in the range is
-   *           smaller, and where M is the last iterator i in [__first, __last)
-   *           such that no other element in the range is larger.
-  */
-  template<typename _ForwardIterator>
+  template<typename _ForwardIterator, typename _Compare>
     pair<_ForwardIterator, _ForwardIterator>
-    minmax_element(_ForwardIterator __first, _ForwardIterator __last)
+    __minmax_element(_ForwardIterator __first, _ForwardIterator __last,
+                    _Compare __comp)
     {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-           typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
       _ForwardIterator __next = __first;
       if (__first == __last
          || ++__next == __last)
        return std::make_pair(__first, __first);
 
       _ForwardIterator __min, __max;
-      if (*__next < *__first)
+      if (__comp(__next, __first))
        {
          __min = __next;
          __max = __first;
@@ -4133,25 +3328,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          __next = __first;
          if (++__next == __last)
            {
-             if (*__first < *__min)
+             if (__comp(__first, __min))
                __min = __first;
-             else if (!(*__first < *__max))
+             else if (!__comp(__first, __max))
                __max = __first;
              break;
            }
 
-         if (*__next < *__first)
+         if (__comp(__next, __first))
            {
-             if (*__next < *__min)
+             if (__comp(__next, __min))
                __min = __next;
-             if (!(*__first < *__max))
+             if (!__comp(__first, __max))
                __max = __first;
            }
          else
            {
-             if (*__first < *__min)
+             if (__comp(__first, __min))
                __min = __first;
-             if (!(*__next < *__max))
+             if (!__comp(__next, __max))
                __max = __next;
            }
 
@@ -4162,6 +3357,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return std::make_pair(__min, __max);
     }
 
+  /**
+   *  @brief  Return a pair of iterators pointing to the minimum and maximum
+   *          elements in a range.
+   *  @ingroup sorting_algorithms
+   *  @param  __first  Start of range.
+   *  @param  __last   End of range.
+   *  @return  make_pair(m, M), where m is the first iterator i in 
+   *           [__first, __last) such that no other element in the range is
+   *           smaller, and where M is the last iterator i in [__first, __last)
+   *           such that no other element in the range is larger.
+  */
+  template<typename _ForwardIterator>
+    inline pair<_ForwardIterator, _ForwardIterator>
+    minmax_element(_ForwardIterator __first, _ForwardIterator __last)
+    {
+      // concept requirements
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
+           typename iterator_traits<_ForwardIterator>::value_type>)
+      __glibcxx_requires_valid_range(__first, __last);
+
+      return std::__minmax_element(__first, __last,
+                                  __gnu_cxx::__ops::__iter_less_iter());
+    }
+
   /**
    *  @brief  Return a pair of iterators pointing to the minimum and maximum
    *          elements in a range.
@@ -4175,7 +3395,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *           such that no other element in the range is larger.
   */
   template<typename _ForwardIterator, typename _Compare>
-    pair<_ForwardIterator, _ForwardIterator>
+    inline pair<_ForwardIterator, _ForwardIterator>
     minmax_element(_ForwardIterator __first, _ForwardIterator __last,
                   _Compare __comp)
     {
@@ -4186,58 +3406,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      _ForwardIterator __next = __first;
-      if (__first == __last
-         || ++__next == __last)
-       return std::make_pair(__first, __first);
-
-      _ForwardIterator __min, __max;
-      if (__comp(*__next, *__first))
-       {
-         __min = __next;
-         __max = __first;
-       }
-      else
-       {
-         __min = __first;
-         __max = __next;
-       }
-
-      __first = __next;
-      ++__first;
-
-      while (__first != __last)
-       {
-         __next = __first;
-         if (++__next == __last)
-           {
-             if (__comp(*__first, *__min))
-               __min = __first;
-             else if (!__comp(*__first, *__max))
-               __max = __first;
-             break;
-           }
-
-         if (__comp(*__next, *__first))
-           {
-             if (__comp(*__next, *__min))
-               __min = __next;
-             if (!__comp(*__first, *__max))
-               __max = __first;
-           }
-         else
-           {
-             if (__comp(*__first, *__min))
-               __min = __first;
-             if (!__comp(*__next, *__max))
-               __max = __next;
-           }
-
-         __first = __next;
-         ++__first;
-       }
-
-      return std::make_pair(__min, __max);
+      return std::__minmax_element(__first, __last,
+                                  __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   // N2722 + DR 915.
@@ -4279,8 +3449,45 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return std::make_pair(*__p.first, *__p.second);
     }
 
+  template<typename _ForwardIterator1, typename _ForwardIterator2,
+          typename _BinaryPredicate>
+    bool
+    __is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
+                    _ForwardIterator2 __first2, _BinaryPredicate __pred)
+    {
+      // Efficiently compare identical prefixes:  O(N) if sequences
+      // have the same elements in the same order.
+      for (; __first1 != __last1; ++__first1, ++__first2)
+       if (!__pred(__first1, __first2))
+         break;
+
+      if (__first1 == __last1)
+       return true;
+
+      // Establish __last2 assuming equal ranges by iterating over the
+      // rest of the list.
+      _ForwardIterator2 __last2 = __first2;
+      std::advance(__last2, std::distance(__first1, __last1));
+      for (_ForwardIterator1 __scan = __first1; __scan != __last1; ++__scan)
+       {
+         if (__scan != std::__find_if(__first1, __scan,
+                         __gnu_cxx::__ops::__iter_comp_iter(__pred, __scan)))
+           continue; // We've seen this one before.
+         
+         auto __matches
+           = std::__count_if(__first2, __last2,
+                       __gnu_cxx::__ops::__iter_comp_iter(__pred, __scan));
+         if (0 == __matches ||
+             std::__count_if(__scan, __last1,
+                       __gnu_cxx::__ops::__iter_comp_iter(__pred, __scan))
+             != __matches)
+           return false;
+       }
+      return true;
+    }
+
   /**
-   *  @brief  Checks whether a permutaion of the second sequence is equal
+   *  @brief  Checks whether a permutation of the second sequence is equal
    *          to the first sequence.
    *  @ingroup non_mutating_algorithms
    *  @param  __first1  Start of first range.
@@ -4292,36 +3499,141 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *          returns true; otherwise, returns false.
   */
   template<typename _ForwardIterator1, typename _ForwardIterator2>
-    bool
+    inline bool
     is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
                   _ForwardIterator2 __first2)
     {
+      // concept requirements
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_EqualOpConcept<
+               typename iterator_traits<_ForwardIterator1>::value_type,
+               typename iterator_traits<_ForwardIterator2>::value_type>)
+      __glibcxx_requires_valid_range(__first1, __last1);
+
+      return std::__is_permutation(__first1, __last1, __first2,
+                                  __gnu_cxx::__ops::__iter_equal_to_iter());
+    }
+
+  /**
+   *  @brief  Checks whether a permutation of the second sequence is equal
+   *          to the first sequence.
+   *  @ingroup non_mutating_algorithms
+   *  @param  __first1  Start of first range.
+   *  @param  __last1   End of first range.
+   *  @param  __first2  Start of second range.
+   *  @param  __pred    A binary predicate.
+   *  @return true if there exists a permutation of the elements in
+   *          the range [__first2, __first2 + (__last1 - __first1)),
+   *          beginning with ForwardIterator2 begin, such that
+   *          equal(__first1, __last1, __begin, __pred) returns true;
+   *          otherwise, returns false.
+  */
+  template<typename _ForwardIterator1, typename _ForwardIterator2,
+          typename _BinaryPredicate>
+    inline bool
+    is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
+                  _ForwardIterator2 __first2, _BinaryPredicate __pred)
+    {
+      // concept requirements
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+           typename iterator_traits<_ForwardIterator1>::value_type,
+           typename iterator_traits<_ForwardIterator2>::value_type>)
+      __glibcxx_requires_valid_range(__first1, __last1);
+
+      return std::__is_permutation(__first1, __last1, __first2,
+                                  __gnu_cxx::__ops::__iter_comp_iter(__pred));
+    }
+
+#if __cplusplus > 201103L
+  template<typename _ForwardIterator1, typename _ForwardIterator2,
+          typename _BinaryPredicate>
+    bool
+    __is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
+                    _ForwardIterator2 __first2, _ForwardIterator2 __last2,
+                    _BinaryPredicate __pred)
+    {
+      using _Cat1
+       = typename iterator_traits<_ForwardIterator1>::iterator_category;
+      using _Cat2
+       = typename iterator_traits<_ForwardIterator2>::iterator_category;
+      using _It1_is_RA = is_same<_Cat1, random_access_iterator_tag>;
+      using _It2_is_RA = is_same<_Cat2, random_access_iterator_tag>;
+      constexpr bool __ra_iters = _It1_is_RA() && _It2_is_RA();
+      if (__ra_iters)
+       {
+         auto __d1 = std::distance(__first1, __last1);
+         auto __d2 = std::distance(__first2, __last2);
+         if (__d1 != __d2)
+           return false;
+       }
+
       // Efficiently compare identical prefixes:  O(N) if sequences
       // have the same elements in the same order.
       for (; __first1 != __last1; ++__first1, ++__first2)
-       if (!(*__first1 == *__first2))
+       if (!__pred(__first1, __first2))
          break;
 
-      if (__first1 == __last1)
-       return true;
+      if (__ra_iters)
+       {
+         if (__first1 == __last1)
+           return true;
+       }
+      else
+       {
+         auto __d1 = std::distance(__first1, __last1);
+         auto __d2 = std::distance(__first2, __last2);
+         if (__d1 == 0 && __d2 == 0)
+           return true;
+         if (__d1 != __d2)
+           return false;
+       }
 
-      // Establish __last2 assuming equal ranges by iterating over the
-      // rest of the list.
-      _ForwardIterator2 __last2 = __first2;
-      std::advance(__last2, std::distance(__first1, __last1));
       for (_ForwardIterator1 __scan = __first1; __scan != __last1; ++__scan)
        {
-         if (__scan != _GLIBCXX_STD_A::find(__first1, __scan, *__scan))
+         if (__scan != std::__find_if(__first1, __scan,
+                       __gnu_cxx::__ops::__iter_comp_iter(__pred, __scan)))
            continue; // We've seen this one before.
 
-         auto __matches = std::count(__first2, __last2, *__scan);
+         auto __matches = std::__count_if(__first2, __last2,
+               __gnu_cxx::__ops::__iter_comp_iter(__pred, __scan));
          if (0 == __matches
-             || std::count(__scan, __last1, *__scan) != __matches)
+             || std::__count_if(__scan, __last1,
+                       __gnu_cxx::__ops::__iter_comp_iter(__pred, __scan))
+             != __matches)
            return false;
        }
       return true;
     }
 
+  /**
+   *  @brief  Checks whether a permutaion of the second sequence is equal
+   *          to the first sequence.
+   *  @ingroup non_mutating_algorithms
+   *  @param  __first1  Start of first range.
+   *  @param  __last1   End of first range.
+   *  @param  __first2  Start of second range.
+   *  @param  __last2   End of first range.
+   *  @return true if there exists a permutation of the elements in the range
+   *          [__first2, __last2), beginning with ForwardIterator2 begin,
+   *          such that equal(__first1, __last1, begin) returns true;
+   *          otherwise, returns false.
+  */
+  template<typename _ForwardIterator1, typename _ForwardIterator2>
+    inline bool
+    is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
+                  _ForwardIterator2 __first2, _ForwardIterator2 __last2)
+    {
+      __glibcxx_requires_valid_range(__first1, __last1);
+      __glibcxx_requires_valid_range(__first2, __last2);
+
+      return
+       std::__is_permutation(__first1, __last1, __first2, __last2,
+                             __gnu_cxx::__ops::__iter_equal_to_iter());
+    }
+
   /**
    *  @brief  Checks whether a permutation of the second sequence is equal
    *          to the first sequence.
@@ -4329,49 +3641,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @param  __first1  Start of first range.
    *  @param  __last1   End of first range.
    *  @param  __first2  Start of second range.
+   *  @param  __last2   End of first range.
    *  @param  __pred    A binary predicate.
-   *  @return true if there exists a permutation of the elements in
-   *          the range [__first2, __first2 + (__last1 - __first1)),
-   *          beginning with ForwardIterator2 begin, such that
-   *          equal(__first1, __last1, __begin, __pred) returns true;
+   *  @return true if there exists a permutation of the elements in the range
+   *          [__first2, __last2), beginning with ForwardIterator2 begin,
+   *          such that equal(__first1, __last1, __begin, __pred) returns true;
    *          otherwise, returns false.
   */
   template<typename _ForwardIterator1, typename _ForwardIterator2,
           typename _BinaryPredicate>
-    bool
+    inline bool
     is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-                  _ForwardIterator2 __first2, _BinaryPredicate __pred)
+                  _ForwardIterator2 __first2, _ForwardIterator2 __last2,
+                  _BinaryPredicate __pred)
     {
-      // Efficiently compare identical prefixes:  O(N) if sequences
-      // have the same elements in the same order.
-      for (; __first1 != __last1; ++__first1, ++__first2)
-       if (!bool(__pred(*__first1, *__first2)))
-         break;
-
-      if (__first1 == __last1)
-       return true;
-
-      // Establish __last2 assuming equal ranges by iterating over the
-      // rest of the list.
-      _ForwardIterator2 __last2 = __first2;
-      std::advance(__last2, std::distance(__first1, __last1));
-      for (_ForwardIterator1 __scan = __first1; __scan != __last1; ++__scan)
-       {
-         using std::placeholders::_1;
+      __glibcxx_requires_valid_range(__first1, __last1);
+      __glibcxx_requires_valid_range(__first2, __last2);
 
-         if (__scan != _GLIBCXX_STD_A::find_if(__first1, __scan,
-                                               std::bind(__pred, _1, *__scan)))
-           continue; // We've seen this one before.
-         
-         auto __matches = std::count_if(__first2, __last2,
-                                        std::bind(__pred, _1, *__scan));
-         if (0 == __matches
-             || std::count_if(__scan, __last1,
-                              std::bind(__pred, _1, *__scan)) != __matches)
-           return false;
-       }
-      return true;
+      return std::__is_permutation(__first1, __last1, __first2, __last2,
+                                  __gnu_cxx::__ops::__iter_comp_iter(__pred));
     }
+#endif
 
 #ifdef _GLIBCXX_USE_C99_STDINT_TR1
   /**
@@ -4413,7 +3703,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 #endif
 
-#endif // __GXX_EXPERIMENTAL_CXX0X__
+#endif // C++11
 
 _GLIBCXX_END_NAMESPACE_VERSION
 
@@ -4462,8 +3752,8 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       __glibcxx_function_requires(_EqualOpConcept<
                typename iterator_traits<_InputIterator>::value_type, _Tp>)
       __glibcxx_requires_valid_range(__first, __last);
-      return std::__find(__first, __last, __val,
-                        std::__iterator_category(__first));
+      return std::__find_if(__first, __last,
+                           __gnu_cxx::__ops::__iter_equals_val(__val));
     }
 
   /**
@@ -4486,8 +3776,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
              typename iterator_traits<_InputIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
-      return std::__find_if(__first, __last, __pred,
-                           std::__iterator_category(__first));
+
+      return std::__find_if(__first, __last,
+                           __gnu_cxx::__ops::__pred_iter(__pred));
     }
 
   /**
@@ -4579,7 +3870,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  or @p __last if no such iterator exists.
   */
   template<typename _ForwardIterator>
-    _ForwardIterator
+    inline _ForwardIterator
     adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
@@ -4587,16 +3878,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       __glibcxx_function_requires(_EqualityComparableConcept<
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
-      if (__first == __last)
-       return __last;
-      _ForwardIterator __next = __first;
-      while(++__next != __last)
-       {
-         if (*__first == *__next)
-           return __first;
-         __first = __next;
-       }
-      return __last;
+
+      return std::__adjacent_find(__first, __last,
+                                 __gnu_cxx::__ops::__iter_equal_to_iter());
     }
 
   /**
@@ -4611,7 +3895,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  exists.
   */
   template<typename _ForwardIterator, typename _BinaryPredicate>
-    _ForwardIterator
+    inline _ForwardIterator
     adjacent_find(_ForwardIterator __first, _ForwardIterator __last,
                  _BinaryPredicate __binary_pred)
     {
@@ -4621,16 +3905,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
            typename iterator_traits<_ForwardIterator>::value_type,
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
-      if (__first == __last)
-       return __last;
-      _ForwardIterator __next = __first;
-      while(++__next != __last)
-       {
-         if (__binary_pred(*__first, *__next))
-           return __first;
-         __first = __next;
-       }
-      return __last;
+
+      return std::__adjacent_find(__first, __last,
+                       __gnu_cxx::__ops::__iter_comp_iter(__binary_pred));
     }
 
   /**
@@ -4643,19 +3920,17 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  for which @c *i == @p __value
   */
   template<typename _InputIterator, typename _Tp>
-    typename iterator_traits<_InputIterator>::difference_type
+    inline typename iterator_traits<_InputIterator>::difference_type
     count(_InputIterator __first, _InputIterator __last, const _Tp& __value)
     {
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
       __glibcxx_function_requires(_EqualOpConcept<
-       typename iterator_traits<_InputIterator>::value_type, _Tp>)
+           typename iterator_traits<_InputIterator>::value_type, _Tp>)
       __glibcxx_requires_valid_range(__first, __last);
-      typename iterator_traits<_InputIterator>::difference_type __n = 0;
-      for (; __first != __last; ++__first)
-       if (*__first == __value)
-         ++__n;
-      return __n;
+
+      return std::__count_if(__first, __last,
+                            __gnu_cxx::__ops::__iter_equals_val(__value));
     }
 
   /**
@@ -4668,7 +3943,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  for which @p __pred(*i) is true.
   */
   template<typename _InputIterator, typename _Predicate>
-    typename iterator_traits<_InputIterator>::difference_type
+    inline typename iterator_traits<_InputIterator>::difference_type
     count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
     {
       // concept requirements
@@ -4676,11 +3951,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
            typename iterator_traits<_InputIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
-      typename iterator_traits<_InputIterator>::difference_type __n = 0;
-      for (; __first != __last; ++__first)
-       if (__pred(*__first))
-         ++__n;
-      return __n;
+
+      return std::__count_if(__first, __last,
+                            __gnu_cxx::__ops::__pred_iter(__pred));
     }
 
   /**
@@ -4710,7 +3983,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  @p [__first1,__last1-(__last2-__first2))
   */
   template<typename _ForwardIterator1, typename _ForwardIterator2>
-    _ForwardIterator1
+    inline _ForwardIterator1
     search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
           _ForwardIterator2 __first2, _ForwardIterator2 __last2)
     {
@@ -4723,40 +3996,8 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       __glibcxx_requires_valid_range(__first1, __last1);
       __glibcxx_requires_valid_range(__first2, __last2);
 
-      // Test for empty ranges
-      if (__first1 == __last1 || __first2 == __last2)
-       return __first1;
-
-      // Test for a pattern of length 1.
-      _ForwardIterator2 __p1(__first2);
-      if (++__p1 == __last2)
-       return _GLIBCXX_STD_A::find(__first1, __last1, *__first2);
-
-      // General case.
-      _ForwardIterator2 __p;
-      _ForwardIterator1 __current = __first1;
-
-      for (;;)
-       {
-         __first1 = _GLIBCXX_STD_A::find(__first1, __last1, *__first2);
-         if (__first1 == __last1)
-           return __last1;
-
-         __p = __p1;
-         __current = __first1;
-         if (++__current == __last1)
-           return __last1;
-
-         while (*__current == *__p)
-           {
-             if (++__p == __last2)
-               return __first1;
-             if (++__current == __last1)
-               return __last1;
-           }
-         ++__first1;
-       }
-      return __first1;
+      return std::__search(__first1, __last1, __first2, __last2,
+                          __gnu_cxx::__ops::__iter_equal_to_iter());
     }
 
   /**
@@ -4782,7 +4023,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _ForwardIterator1, typename _ForwardIterator2,
           typename _BinaryPredicate>
-    _ForwardIterator1
+    inline _ForwardIterator1
     search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
           _ForwardIterator2 __first2, _ForwardIterator2 __last2,
           _BinaryPredicate  __predicate)
@@ -4796,50 +4037,10 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       __glibcxx_requires_valid_range(__first1, __last1);
       __glibcxx_requires_valid_range(__first2, __last2);
 
-      // Test for empty ranges
-      if (__first1 == __last1 || __first2 == __last2)
-       return __first1;
-
-      // Test for a pattern of length 1.
-      _ForwardIterator2 __p1(__first2);
-      if (++__p1 == __last2)
-       {
-         while (__first1 != __last1
-                && !bool(__predicate(*__first1, *__first2)))
-           ++__first1;
-         return __first1;
-       }
-
-      // General case.
-      _ForwardIterator2 __p;
-      _ForwardIterator1 __current = __first1;
-
-      for (;;)
-       {
-         while (__first1 != __last1
-                && !bool(__predicate(*__first1, *__first2)))
-           ++__first1;
-         if (__first1 == __last1)
-           return __last1;
-
-         __p = __p1;
-         __current = __first1;
-         if (++__current == __last1)
-           return __last1;
-
-         while (__predicate(*__current, *__p))
-           {
-             if (++__p == __last2)
-               return __first1;
-             if (++__current == __last1)
-               return __last1;
-           }
-         ++__first1;
-       }
-      return __first1;
+      return std::__search(__first1, __last1, __first2, __last2,
+                          __gnu_cxx::__ops::__iter_comp_iter(__predicate));
     }
 
-
   /**
    *  @brief Search a sequence for a number of consecutive values.
    *  @ingroup non_mutating_algorithms
@@ -4856,22 +4057,18 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  equal to @p __val.
   */
   template<typename _ForwardIterator, typename _Integer, typename _Tp>
-    _ForwardIterator
+    inline _ForwardIterator
     search_n(_ForwardIterator __first, _ForwardIterator __last,
             _Integer __count, const _Tp& __val)
     {
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
       __glibcxx_function_requires(_EqualOpConcept<
-       typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
+           typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__count <= 0)
-       return __first;
-      if (__count == 1)
-       return _GLIBCXX_STD_A::find(__first, __last, __val);
-      return std::__search_n(__first, __last, __count, __val,
-                            std::__iterator_category(__first));
+      return std::__search_n(__first, __last, __count,
+                            __gnu_cxx::__ops::__iter_equals_val(__val));
     }
 
 
@@ -4894,7 +4091,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _ForwardIterator, typename _Integer, typename _Tp,
            typename _BinaryPredicate>
-    _ForwardIterator
+    inline _ForwardIterator
     search_n(_ForwardIterator __first, _ForwardIterator __last,
             _Integer __count, const _Tp& __val,
             _BinaryPredicate __binary_pred)
@@ -4905,16 +4102,8 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
            typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__count <= 0)
-       return __first;
-      if (__count == 1)
-       {
-         while (__first != __last && !bool(__binary_pred(*__first, __val)))
-           ++__first;
-         return __first;
-       }
-      return std::__search_n(__first, __last, __count, __val, __binary_pred,
-                            std::__iterator_category(__first));
+      return std::__search_n(__first, __last, __count,
+               __gnu_cxx::__ops::__iter_comp_val(__binary_pred, __val));
     }
 
 
@@ -5114,7 +4303,6 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       return __first;
     }
 
-
   /**
    *  @brief Copy a sequence, removing consecutive duplicate values.
    *  @ingroup mutating_algorithms
@@ -5152,6 +4340,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       if (__first == __last)
        return __result;
       return std::__unique_copy(__first, __last, __result,
+                               __gnu_cxx::__ops::__iter_equal_to_iter(),
                                std::__iterator_category(__first),
                                std::__iterator_category(__result));
     }
@@ -5190,12 +4379,12 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
 
       if (__first == __last)
        return __result;
-      return std::__unique_copy(__first, __last, __result, __binary_pred,
+      return std::__unique_copy(__first, __last, __result,
+                       __gnu_cxx::__ops::__iter_comp_iter(__binary_pred),
                                std::__iterator_category(__first),
                                std::__iterator_category(__result));
     }
 
-
   /**
    *  @brief Randomly shuffle the elements of a sequence.
    *  @ingroup mutating_algorithms
@@ -5218,7 +4407,13 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
 
       if (__first != __last)
        for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-         std::iter_swap(__i, __first + (std::rand() % ((__i - __first) + 1)));
+         {
+           // XXX rand() % N is not uniformly distributed
+           _RandomAccessIterator __j = __first
+                                       + std::rand() % ((__i - __first) + 1);
+           if (__i != __j)
+             std::iter_swap(__i, __j);
+         }
     }
 
   /**
@@ -5238,7 +4433,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   template<typename _RandomAccessIterator, typename _RandomNumberGenerator>
     void
     random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
                   _RandomNumberGenerator&& __rand)
 #else
                   _RandomNumberGenerator& __rand)
@@ -5252,7 +4447,11 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
       if (__first == __last)
        return;
       for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-       std::iter_swap(__i, __first + __rand((__i - __first) + 1));
+       {
+         _RandomAccessIterator __j = __first + __rand((__i - __first) + 1);
+         if (__i != __j)
+           std::iter_swap(__i, __j);
+       }
     }
 
 
@@ -5288,7 +4487,6 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
     }
 
 
-
   /**
    *  @brief Sort the smallest elements of a sequence.
    *  @ingroup sorting_algorithms
@@ -5311,18 +4509,16 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
                 _RandomAccessIterator __middle,
                 _RandomAccessIterator __last)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
            _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __middle);
       __glibcxx_requires_valid_range(__middle, __last);
 
-      std::__heap_select(__first, __middle, __last);
-      std::sort_heap(__first, __middle);
+      std::__partial_sort(__first, __middle, __last,
+                         __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -5351,19 +4547,17 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
                 _RandomAccessIterator __last,
                 _Compare __comp)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
            _RandomAccessIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType, _ValueType>)
+           typename iterator_traits<_RandomAccessIterator>::value_type,
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __middle);
       __glibcxx_requires_valid_range(__middle, __last);
 
-      std::__heap_select(__first, __middle, __last, __comp);
-      std::sort_heap(__first, __middle, __comp);
+      std::__partial_sort(__first, __middle, __last,
+                         __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   /**
@@ -5386,13 +4580,11 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
     nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth,
                _RandomAccessIterator __last)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
                                  _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __nth);
       __glibcxx_requires_valid_range(__nth, __last);
 
@@ -5400,7 +4592,8 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
        return;
 
       std::__introselect(__first, __nth, __last,
-                        std::__lg(__last - __first) * 2);
+                        std::__lg(__last - __first) * 2,
+                        __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -5425,14 +4618,12 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
     nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth,
                _RandomAccessIterator __last, _Compare __comp)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
                                  _RandomAccessIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType, _ValueType>)
+           typename iterator_traits<_RandomAccessIterator>::value_type,
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __nth);
       __glibcxx_requires_valid_range(__nth, __last);
 
@@ -5440,10 +4631,10 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
        return;
 
       std::__introselect(__first, __nth, __last,
-                        std::__lg(__last - __first) * 2, __comp);
+                        std::__lg(__last - __first) * 2,
+                        __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
-
   /**
    *  @brief Sort the elements of a sequence.
    *  @ingroup sorting_algorithms
@@ -5462,21 +4653,14 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
     inline void
     sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
            _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first != __last)
-       {
-         std::__introsort_loop(__first, __last,
-                               std::__lg(__last - __first) * 2);
-         std::__final_insertion_sort(__first, __last);
-       }
+      std::__sort(__first, __last, __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -5499,22 +4683,40 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
     sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
         _Compare __comp)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
            _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType,
-                                 _ValueType>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
+           typename iterator_traits<_RandomAccessIterator>::value_type,
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first != __last)
+      std::__sort(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__comp));
+    }
+
+  template<typename _InputIterator1, typename _InputIterator2,
+          typename _OutputIterator, typename _Compare>
+    _OutputIterator
+    __merge(_InputIterator1 __first1, _InputIterator1 __last1,
+           _InputIterator2 __first2, _InputIterator2 __last2,
+           _OutputIterator __result, _Compare __comp)
+    {
+      while (__first1 != __last1 && __first2 != __last2)
        {
-         std::__introsort_loop(__first, __last,
-                               std::__lg(__last - __first) * 2, __comp);
-         std::__final_insertion_sort(__first, __last, __comp);
+         if (__comp(__first2, __first1))
+           {
+             *__result = *__first2;
+             ++__first2;
+           }
+         else
+           {
+             *__result = *__first1;
+             ++__first1;
+           }
+         ++__result;
        }
+      return std::copy(__first2, __last2,
+                      std::copy(__first1, __last1, __result));
     }
 
   /**
@@ -5538,43 +4740,27 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator>
-    _OutputIterator
+    inline _OutputIterator
     merge(_InputIterator1 __first1, _InputIterator1 __last1,
          _InputIterator2 __first2, _InputIterator2 __last2,
          _OutputIterator __result)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)        
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)     
       __glibcxx_requires_sorted_set(__first1, __last1, __first2);
       __glibcxx_requires_sorted_set(__first2, __last2, __first1);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       {
-         if (*__first2 < *__first1)
-           {
-             *__result = *__first2;
-             ++__first2;
-           }
-         else
-           {
-             *__result = *__first1;
-             ++__first1;
-           }
-         ++__result;
-       }
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-                                                   __result));
+      return _GLIBCXX_STD_A::__merge(__first1, __last1,
+                                    __first2, __last2, __result,
+                                    __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -5602,47 +4788,49 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator, typename _Compare>
-    _OutputIterator
+    inline _OutputIterator
     merge(_InputIterator1 __first1, _InputIterator1 __last1,
          _InputIterator2 __first2, _InputIterator2 __last2,
          _OutputIterator __result, _Compare __comp)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType2>)
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
       __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       {
-         if (__comp(*__first2, *__first1))
-           {
-             *__result = *__first2;
-             ++__first2;
-           }
-         else
-           {
-             *__result = *__first1;
-             ++__first1;
-           }
-         ++__result;
-       }
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-                                                   __result));
+      return _GLIBCXX_STD_A::__merge(__first1, __last1,
+                               __first2, __last2, __result,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
+    }
+
+  template<typename _RandomAccessIterator, typename _Compare>
+    inline void
+    __stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
+                 _Compare __comp)
+    {
+      typedef typename iterator_traits<_RandomAccessIterator>::value_type
+       _ValueType;
+      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
+       _DistanceType;
+
+      typedef _Temporary_buffer<_RandomAccessIterator, _ValueType> _TmpBuf;
+      _TmpBuf __buf(__first, __last);
+
+      if (__buf.begin() == 0)
+       std::__inplace_stable_sort(__first, __last, __comp);
+      else
+       std::__stable_sort_adaptive(__first, __last, __buf.begin(),
+                                   _DistanceType(__buf.size()), __comp);
     }
 
-
   /**
    *  @brief Sort the elements of a sequence, preserving the relative order
    *         of equivalent elements.
@@ -5664,24 +4852,15 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
     inline void
     stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-       _DistanceType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
            _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      _Temporary_buffer<_RandomAccessIterator, _ValueType> __buf(__first,
-                                                                __last);
-      if (__buf.begin() == 0)
-       std::__inplace_stable_sort(__first, __last);
-      else
-       std::__stable_sort_adaptive(__first, __last, __buf.begin(),
-                                   _DistanceType(__buf.size()));
+      _GLIBCXX_STD_A::__stable_sort(__first, __last,
+                                   __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -5707,28 +4886,49 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
     stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
                _Compare __comp)
     {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-       _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-       _DistanceType;
-
       // concept requirements
       __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
            _RandomAccessIterator>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType,
-                                 _ValueType>)
+           typename iterator_traits<_RandomAccessIterator>::value_type,
+           typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      _Temporary_buffer<_RandomAccessIterator, _ValueType> __buf(__first,
-                                                                __last);
-      if (__buf.begin() == 0)
-       std::__inplace_stable_sort(__first, __last, __comp);
-      else
-       std::__stable_sort_adaptive(__first, __last, __buf.begin(),
-                                   _DistanceType(__buf.size()), __comp);
+      _GLIBCXX_STD_A::__stable_sort(__first, __last,
+                                   __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
+  template<typename _InputIterator1, typename _InputIterator2,
+          typename _OutputIterator,
+          typename _Compare>
+    _OutputIterator
+    __set_union(_InputIterator1 __first1, _InputIterator1 __last1,
+               _InputIterator2 __first2, _InputIterator2 __last2,
+               _OutputIterator __result, _Compare __comp)
+    {
+      while (__first1 != __last1 && __first2 != __last2)
+       {
+         if (__comp(__first1, __first2))
+           {
+             *__result = *__first1;
+             ++__first1;
+           }
+         else if (__comp(__first2, __first1))
+           {
+             *__result = *__first2;
+             ++__first2;
+           }
+         else
+           {
+             *__result = *__first1;
+             ++__first1;
+             ++__first2;
+           }
+         ++__result;
+       }
+      return std::copy(__first2, __last2,
+                      std::copy(__first1, __last1, __result));
+    }
 
   /**
    *  @brief Return the union of two sorted ranges.
@@ -5750,50 +4950,30 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator>
-    _OutputIterator
+    inline _OutputIterator
     set_union(_InputIterator1 __first1, _InputIterator1 __last1,
              _InputIterator2 __first2, _InputIterator2 __last2,
              _OutputIterator __result)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType1, _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set(__first1, __last1, __first2);
       __glibcxx_requires_sorted_set(__first2, __last2, __first1);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       {
-         if (*__first1 < *__first2)
-           {
-             *__result = *__first1;
-             ++__first1;
-           }
-         else if (*__first2 < *__first1)
-           {
-             *__result = *__first2;
-             ++__first2;
-           }
-         else
-           {
-             *__result = *__first1;
-             ++__first1;
-             ++__first2;
-           }
-         ++__result;
-       }
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-                                                   __result));
+      return _GLIBCXX_STD_A::__set_union(__first1, __last1,
+                               __first2, __last2, __result,
+                               __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -5817,52 +4997,53 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator, typename _Compare>
-    _OutputIterator
+    inline _OutputIterator
     set_union(_InputIterator1 __first1, _InputIterator1 __last1,
              _InputIterator2 __first2, _InputIterator2 __last2,
              _OutputIterator __result, _Compare __comp)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType2>)
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType1, _ValueType2>)
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
       __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
 
+      return _GLIBCXX_STD_A::__set_union(__first1, __last1,
+                               __first2, __last2, __result,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
+    }
+
+  template<typename _InputIterator1, typename _InputIterator2,
+          typename _OutputIterator,
+          typename _Compare>
+    _OutputIterator
+    __set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
+                      _InputIterator2 __first2, _InputIterator2 __last2,
+                      _OutputIterator __result, _Compare __comp)
+    {
       while (__first1 != __last1 && __first2 != __last2)
-       {
-         if (__comp(*__first1, *__first2))
-           {
-             *__result = *__first1;
-             ++__first1;
-           }
-         else if (__comp(*__first2, *__first1))
-           {
-             *__result = *__first2;
-             ++__first2;
-           }
-         else
-           {
-             *__result = *__first1;
-             ++__first1;
-             ++__first2;
-           }
-         ++__result;
-       }
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-                                                   __result));
+       if (__comp(__first1, __first2))
+         ++__first1;
+       else if (__comp(__first2, __first1))
+         ++__first2;
+       else
+         {
+           *__result = *__first1;
+           ++__first1;
+           ++__first2;
+           ++__result;
+         }
+      return __result;
     }
 
   /**
@@ -5884,39 +5065,28 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator>
-    _OutputIterator
+    inline _OutputIterator
     set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
                     _InputIterator2 __first2, _InputIterator2 __last2,
                     _OutputIterator __result)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType1, _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set(__first1, __last1, __first2);
       __glibcxx_requires_sorted_set(__first2, __last2, __first1);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       if (*__first1 < *__first2)
-         ++__first1;
-       else if (*__first2 < *__first1)
-         ++__first2;
-       else
-         {
-           *__result = *__first1;
-           ++__first1;
-           ++__first2;
-           ++__result;
-         }
-      return __result;
+      return _GLIBCXX_STD_A::__set_intersection(__first1, __last1,
+                                    __first2, __last2, __result,
+                                    __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -5941,41 +5111,53 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator, typename _Compare>
-    _OutputIterator
+    inline _OutputIterator
     set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
                     _InputIterator2 __first2, _InputIterator2 __last2,
                     _OutputIterator __result, _Compare __comp)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType1, _ValueType2>)
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
       __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
 
+      return _GLIBCXX_STD_A::__set_intersection(__first1, __last1,
+                               __first2, __last2, __result,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
+    }
+
+  template<typename _InputIterator1, typename _InputIterator2,
+          typename _OutputIterator,
+          typename _Compare>
+    _OutputIterator
+    __set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
+                    _InputIterator2 __first2, _InputIterator2 __last2,
+                    _OutputIterator __result, _Compare __comp)
+    {
       while (__first1 != __last1 && __first2 != __last2)
-       if (__comp(*__first1, *__first2))
-         ++__first1;
-       else if (__comp(*__first2, *__first1))
+       if (__comp(__first1, __first2))
+         {
+           *__result = *__first1;
+           ++__first1;
+           ++__result;
+         }
+       else if (__comp(__first2, __first1))
          ++__first2;
        else
          {
-           *__result = *__first1;
            ++__first1;
            ++__first2;
-           ++__result;
          }
-      return __result;
+      return std::copy(__first1, __last1, __result);
     }
 
   /**
@@ -5999,41 +5181,28 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator>
-    _OutputIterator
+    inline _OutputIterator
     set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
                   _InputIterator2 __first2, _InputIterator2 __last2,
                   _OutputIterator __result)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType1, _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)        
+           typename iterator_traits<_InputIterator1>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)     
       __glibcxx_requires_sorted_set(__first1, __last1, __first2);
       __glibcxx_requires_sorted_set(__first2, __last2, __first1);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       if (*__first1 < *__first2)
-         {
-           *__result = *__first1;
-           ++__first1;
-           ++__result;
-         }
-       else if (*__first2 < *__first1)
-         ++__first2;
-       else
-         {
-           ++__first1;
-           ++__first2;
-         }
-      return std::copy(__first1, __last1, __result);
+      return _GLIBCXX_STD_A::__set_difference(__first1, __last1,
+                                  __first2, __last2, __result,
+                                  __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -6060,43 +5229,61 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator, typename _Compare>
-    _OutputIterator
+    inline _OutputIterator
     set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
                   _InputIterator2 __first2, _InputIterator2 __last2,
                   _OutputIterator __result, _Compare __comp)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType1, _ValueType2>)
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
       __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
 
+      return _GLIBCXX_STD_A::__set_difference(__first1, __last1,
+                                  __first2, __last2, __result,
+                                  __gnu_cxx::__ops::__iter_comp_iter(__comp));
+    }
+
+  template<typename _InputIterator1, typename _InputIterator2,
+          typename _OutputIterator,
+          typename _Compare>
+    _OutputIterator
+    __set_symmetric_difference(_InputIterator1 __first1,
+                              _InputIterator1 __last1,
+                              _InputIterator2 __first2,
+                              _InputIterator2 __last2,
+                              _OutputIterator __result,
+                              _Compare __comp)
+    {
       while (__first1 != __last1 && __first2 != __last2)
-       if (__comp(*__first1, *__first2))
+       if (__comp(__first1, __first2))
          {
            *__result = *__first1;
            ++__first1;
            ++__result;
          }
-       else if (__comp(*__first2, *__first1))
-         ++__first2;
+       else if (__comp(__first2, __first1))
+         {
+           *__result = *__first2;
+           ++__first2;
+           ++__result;
+         }
        else
          {
            ++__first1;
            ++__first2;
          }
-      return std::copy(__first1, __last1, __result);
+      return std::copy(__first2, __last2, 
+                      std::copy(__first1, __last1, __result));
     }
 
   /**
@@ -6118,48 +5305,30 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator>
-    _OutputIterator
+    inline _OutputIterator
     set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
                             _InputIterator2 __first2, _InputIterator2 __last2,
                             _OutputIterator __result)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType1, _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)        
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)     
       __glibcxx_requires_sorted_set(__first1, __last1, __first2);
       __glibcxx_requires_sorted_set(__first2, __last2, __first1);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       if (*__first1 < *__first2)
-         {
-           *__result = *__first1;
-           ++__first1;
-           ++__result;
-         }
-       else if (*__first2 < *__first1)
-         {
-           *__result = *__first2;
-           ++__first2;
-           ++__result;
-         }
-       else
-         {
-           ++__first1;
-           ++__first2;
-         }
-      return std::copy(__first2, __last2, std::copy(__first1,
-                                                   __last1, __result));
+      return _GLIBCXX_STD_A::__set_symmetric_difference(__first1, __last1,
+                                       __first2, __last2, __result,
+                                       __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -6184,53 +5353,46 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _InputIterator1, typename _InputIterator2,
           typename _OutputIterator, typename _Compare>
-    _OutputIterator
+    inline _OutputIterator
     set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
                             _InputIterator2 __first2, _InputIterator2 __last2,
                             _OutputIterator __result,
                             _Compare __comp)
     {
-      typedef typename iterator_traits<_InputIterator1>::value_type
-       _ValueType1;
-      typedef typename iterator_traits<_InputIterator2>::value_type
-       _ValueType2;
-
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType1>)
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-                                 _ValueType2>)
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType1, _ValueType2>)
+           typename iterator_traits<_InputIterator1>::value_type,
+           typename iterator_traits<_InputIterator2>::value_type>)
       __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-                                 _ValueType2, _ValueType1>)
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
       __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
 
-      while (__first1 != __last1 && __first2 != __last2)
-       if (__comp(*__first1, *__first2))
-         {
-           *__result = *__first1;
-           ++__first1;
-           ++__result;
-         }
-       else if (__comp(*__first2, *__first1))
-         {
-           *__result = *__first2;
-           ++__first2;
-           ++__result;
-         }
-       else
-         {
-           ++__first1;
-           ++__first2;
-         }
-      return std::copy(__first2, __last2, 
-                      std::copy(__first1, __last1, __result));
+      return _GLIBCXX_STD_A::__set_symmetric_difference(__first1, __last1,
+                               __first2, __last2, __result,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
+  template<typename _ForwardIterator, typename _Compare>
+    _ForwardIterator
+    __min_element(_ForwardIterator __first, _ForwardIterator __last,
+                 _Compare __comp)
+    {
+      if (__first == __last)
+       return __first;
+      _ForwardIterator __result = __first;
+      while (++__first != __last)
+       if (__comp(__first, __result))
+         __result = __first;
+      return __result;
+    }
 
   /**
    *  @brief  Return the minimum element in a range.
@@ -6241,7 +5403,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
   */
   template<typename _ForwardIterator>
     _ForwardIterator
-    min_element(_ForwardIterator __first, _ForwardIterator __last)
+    inline min_element(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
       __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
@@ -6249,13 +5411,8 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last)
-       return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-       if (*__first < *__result)
-         __result = __first;
-      return __result;
+      return _GLIBCXX_STD_A::__min_element(__first, __last,
+                               __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -6268,7 +5425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  according to __comp.
   */
   template<typename _ForwardIterator, typename _Compare>
-    _ForwardIterator
+    inline _ForwardIterator
     min_element(_ForwardIterator __first, _ForwardIterator __last,
                _Compare __comp)
     {
@@ -6279,11 +5436,19 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last)
-       return __first;
+      return _GLIBCXX_STD_A::__min_element(__first, __last,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
+    }
+
+  template<typename _ForwardIterator, typename _Compare>
+    _ForwardIterator
+    __max_element(_ForwardIterator __first, _ForwardIterator __last,
+                 _Compare __comp)
+    {
+      if (__first == __last) return __first;
       _ForwardIterator __result = __first;
       while (++__first != __last)
-       if (__comp(*__first, *__result))
+       if (__comp(__result, __first))
          __result = __first;
       return __result;
     }
@@ -6296,7 +5461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  @return  Iterator referencing the first instance of the largest value.
   */
   template<typename _ForwardIterator>
-    _ForwardIterator
+    inline _ForwardIterator
     max_element(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
@@ -6305,13 +5470,8 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last)
-       return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-       if (*__result < *__first)
-         __result = __first;
-      return __result;
+      return _GLIBCXX_STD_A::__max_element(__first, __last,
+                               __gnu_cxx::__ops::__iter_less_iter());
     }
 
   /**
@@ -6324,7 +5484,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
    *  according to __comp.
   */
   template<typename _ForwardIterator, typename _Compare>
-    _ForwardIterator
+    inline _ForwardIterator
     max_element(_ForwardIterator __first, _ForwardIterator __last,
                _Compare __comp)
     {
@@ -6335,12 +5495,8 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
            typename iterator_traits<_ForwardIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      if (__first == __last) return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-       if (__comp(*__result, *__first))
-         __result = __first;
-      return __result;
+      return _GLIBCXX_STD_A::__max_element(__first, __last,
+                               __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
 _GLIBCXX_END_NAMESPACE_ALGO