OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert: stl_algobase.h (max, min): Use conditional operator. 

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.

From-SVN: r191652
This commit is contained in:
Paolo Carlini 2012-09-23 19:58:16 +00:00 committed by Paolo Carlini
parent f18b27b3e2
commit 4fd97a6380
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
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

26
libstdc++-v3/include/bits/stl_algobase.h
View File

@ -195,8 +195,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
// concept requirements
__glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
return __b < __a ? __b : __a;
//return __b < __a ? __b : __a;
if (__b < __a)
return __b;
return __a;
}
/**
@ -216,8 +218,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
// concept requirements
__glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
return __a < __b ? __b : __a;
//return __a < __b ? __b : __a;
if (__a < __b)
return __b;
return __a;
}
/**
@ -234,7 +238,12 @@ _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; }
{
//return __comp(__b, __a) ? __b : __a;
if (__comp(__b, __a))
return __b;
return __a;
}
/**
* @brief This does what you think it does.
@ -250,7 +259,12 @@ _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; }
{
//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, ...