2012-09-21 Paolo Carlini <paolo.carlini@oracle.com>

	* include/bits/stl_algobase.h (max, min): Use conditional operator.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@191608 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3efec87..82ac417 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/bits/stl_algobase.h (max, min): Use conditional operator.
+
 2012-09-18  Benjamin Kosnik  <bkoz@redhat.com>
 
        PR libstdc++/28811

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index fe30f6c..3099d0d 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -195,10 +195,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       // concept requirements
       __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      //return __b < __a ? __b : __a;
-      if (__b < __a)
-       return __b;
-      return __a;
+
+      return __b < __a ? __b : __a;
     }
 
   /**
@@ -218,10 +216,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       // concept requirements
       __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      //return  __a < __b ? __b : __a;
-      if (__a < __b)
-       return __b;
-      return __a;
+
+      return  __a < __b ? __b : __a;
     }
 
   /**
@@ -238,12 +234,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Tp, typename _Compare>
     inline const _Tp&
     min(const _Tp& __a, const _Tp& __b, _Compare __comp)
-    {
-      //return __comp(__b, __a) ? __b : __a;
-      if (__comp(__b, __a))
-       return __b;
-      return __a;
-    }
+    { return __comp(__b, __a) ? __b : __a; }
 
   /**
    *  @brief This does what you think it does.
@@ -259,12 +250,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Tp, typename _Compare>
     inline const _Tp&
     max(const _Tp& __a, const _Tp& __b, _Compare __comp)
-    {
-      //return __comp(__a, __b) ? __b : __a;
-      if (__comp(__a, __b))
-       return __b;
-      return __a;
-    }
+    { return __comp(__a, __b) ? __b : __a; }
 
   // If _Iterator is a __normal_iterator return its base (a plain pointer,
   // normally) otherwise return it untouched.  See copy, fill, ...