[Boost-commit] svn:boost r42354 - sandbox/boost/sequence_algo

From: philgarofalo_at_[hidden]
Date: 2007-12-29 20:57:55

Author: pgarofalo
Date: 2007-12-29 20:57:55 EST (Sat, 29 Dec 2007)
New Revision: 42354
URL: http://svn.boost.org/trac/boost/changeset/42354

Log:
Eliminated reverse_args function. This function was introduced to eliminate a compiler warning but proved to be unnecessary.
Text files modified: 
   sandbox/boost/sequence_algo/combinatorial.hpp |    31 +++++++++++++++----------------         
   1 files changed, 15 insertions(+), 16 deletions(-)

Modified: sandbox/boost/sequence_algo/combinatorial.hpp
==============================================================================
--- sandbox/boost/sequence_algo/combinatorial.hpp	(original)
+++ sandbox/boost/sequence_algo/combinatorial.hpp	2007-12-29 20:57:55 EST (Sat, 29 Dec 2007)
@@ -83,13 +83,6 @@
         }
     };  // binary_reverse class
 
-    template <class Predicate>
-        inline binary_reverse<Predicate>
-        reverse_args(const Predicate& pred)
-    {
-        return binary_reverse<Predicate>(pred);
-    }
-
     // Two exception objects
 
     // combinatorial_range_error ------------------------------------------//
@@ -181,7 +174,8 @@
         {
             // find smallest element greater than *i after index i.
             RandomAccessIterator k =
-                min_element_if(i + 1, last, comp, std::bind2nd(reverse_args(comp), *i));
+                min_element_if(i + 1, last, comp,
+                std::bind2nd(binary_reverse<Compare>(comp), *i));
 
             if (k == last)            // Didn't find it.
                 if (i == first)
@@ -194,7 +188,7 @@
             else
             {
                 std::swap(*i,* k);
-                std::partial_sort(i + 1, r, last, comp);    // O(n lg n), heapsort
+                std::partial_sort(i + 1, r, last, comp); // O(n lg n), heapsort
                 return true;
             }    // else
         }    // while
@@ -235,7 +229,8 @@
             if (k == last)            // Didn't find it.
                 if (i == first)
                 {
-                    std::partial_sort(first, r, last, reverse_args(std::less<T>()));
+                    std::partial_sort(first, r, last,
+                        binary_reverse(std::less<T>()));
                     return false;    // we're done--end of permutations
                 }
                 else
@@ -243,7 +238,8 @@
             else
             {
                 std::swap(*i,* k);
-                std::partial_sort(i+1, r, last, reverse_args(std::less<T>()));    // O(n lg n), heapsort
+                std::partial_sort(i+1, r, last,
+                    binary_reverse(std::less<T>())); // O(n lg n), heapsort
                 return true;
             }    // else
         }    // while
@@ -276,7 +272,7 @@
             if (k == last)            // Didn't find it.
                 if (i == first)
                 {
-                    std::partial_sort(first, r, last, reverse_args(comp));
+                    std::partial_sort(first, r, last, binary_reverse<Compare>(comp));
                     return false;    // we're done--end of permutations
                 }
                 else
@@ -284,7 +280,8 @@
             else
             {
                 std::swap(*i,* k);
-                std::partial_sort(i + 1, r, last, reverse_args(comp));    // O(n lg n), heapsort 
+                std::partial_sort(i + 1, r, last,
+                    binary_reverse<Compare>(comp)); // O(n lg n), heapsort 
                 return true;
             }    // else
         }    // while
@@ -337,7 +334,8 @@
                 for(++i; i < r; i++)
                 {
                     // find smallest element greater than *(i - 1) after r - 1.
-                    j = min_element_if(r, last, std::bind1st(std::less<T>(), *(i - 1)));
+                    j = min_element_if(r, last,
+                        std::bind1st(std::less<T>(), *(i - 1)));
                     if (j != last)
                         std::swap(*i,* j);
                 }    // for
@@ -370,7 +368,8 @@
         {
             // find smallest element greater than *i after r - 1.
             RandomAccessIterator j =
-                min_element_if(r, last, comp, std::bind2nd(reverse_args(comp), *i));
+                min_element_if(r, last, comp,
+                std::bind2nd(binary_reverse<Compare>(comp), *i));
             if (j == last)
                 if (i == first)
                 {
@@ -386,7 +385,7 @@
                 {
                     // find smallest element greater than *(i - 1) after r - 1.
                     j = min_element_if(r, last, comp,
-                        std::bind2nd(reverse_args(comp), *(i - 1)));
+                        std::bind2nd(binary_reverse<Compare>(comp), *(i - 1)));
                     if (j != last)
                         std::swap(*i, *j);
                 }    // for