+2012-09-23 Paolo Carlini <paolo.carlini@oracle.com>
+
+ Revert:
+ 2012-09-21 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * include/bits/stl_algobase.h (max, min): Use conditional operator.
+
2012-09-23 Uros Bizjak <ubizjak@gmail.com>
PR libstdc++/54675
{
// concept requirements
__glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-
- return __b < __a ? __b : __a;
+ //return __b < __a ? __b : __a;
+ if (__b < __a)
+ return __b;
+ return __a;
}
/**
{
// concept requirements
__glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-
- return __a < __b ? __b : __a;
+ //return __a < __b ? __b : __a;
+ if (__a < __b)
+ return __b;
+ return __a;
}
/**
template<typename _Tp, typename _Compare>
inline const _Tp&
min(const _Tp& __a, const _Tp& __b, _Compare __comp)
- { return __comp(__b, __a) ? __b : __a; }
+ {
+ //return __comp(__b, __a) ? __b : __a;
+ if (__comp(__b, __a))
+ return __b;
+ return __a;
+ }
/**
* @brief This does what you think it does.
template<typename _Tp, typename _Compare>
inline const _Tp&
max(const _Tp& __a, const _Tp& __b, _Compare __comp)
- { return __comp(__a, __b) ? __b : __a; }
+ {
+ //return __comp(__a, __b) ? __b : __a;
+ if (__comp(__a, __b))
+ return __b;
+ return __a;
+ }
// If _Iterator is a __normal_iterator return its base (a plain pointer,
// normally) otherwise return it untouched. See copy, fill, ...