git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/45488 (lower_bound doesn't really require the iterator parameters to be default constructible) 

2010-09-01  Christopher Yeleighton  <giecrilj@stegny.2a.pl>
	    Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/45488
	* include/bits/stl_algobase.h (lower_bound): Clean-up a tad, move
	two variables inside the main loop.
	* include/bits/stl_algo.h (lower_bound, upper_bound, equal_range):
	Likewise.

From-SVN: r163747
This commit is contained in:
Christopher Yeleighton 2010-09-01 22:58:15 +00:00 committed by Paolo Carlini
parent 5ad97fcf61
commit 1ed78d6c3d
2 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libstdc++-v3/include/bits/stl_algo.h
View File

@ -2403,13 +2403,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__val, __comp); __val, __comp);
_DistanceType __len = std::distance(__first, __last); _DistanceType __len = std::distance(__first, __last);
_DistanceType __half;
_ForwardIterator __middle;
while (__len > 0) while (__len > 0)
{ {
__half = __len >> 1; _DistanceType __half = __len >> 1;
__middle = __first; _ForwardIterator __middle = __first;
std::advance(__middle, __half); std::advance(__middle, __half);
if (__comp(*__middle, __val)) if (__comp(*__middle, __val))
{ {
@ -2450,13 +2448,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__glibcxx_requires_partitioned_upper(__first, __last, __val); __glibcxx_requires_partitioned_upper(__first, __last, __val);
_DistanceType __len = std::distance(__first, __last); _DistanceType __len = std::distance(__first, __last);
_DistanceType __half;
_ForwardIterator __middle;
while (__len > 0) while (__len > 0)
{ {
__half = __len >> 1; _DistanceType __half = __len >> 1;
__middle = __first; _ForwardIterator __middle = __first;
std::advance(__middle, __half); std::advance(__middle, __half);
if (__val < *__middle) if (__val < *__middle)
__len = __half; __len = __half;
@ -2503,13 +2499,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__val, __comp); __val, __comp);
_DistanceType __len = std::distance(__first, __last); _DistanceType __len = std::distance(__first, __last);
_DistanceType __half;
_ForwardIterator __middle;
while (__len > 0) while (__len > 0)
{ {
__half = __len >> 1; _DistanceType __half = __len >> 1;
__middle = __first; _ForwardIterator __middle = __first;
std::advance(__middle, __half); std::advance(__middle, __half);
if (__comp(__val, *__middle)) if (__comp(__val, *__middle))
__len = __half; __len = __half;
@ -2558,13 +2552,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__glibcxx_requires_partitioned_upper(__first, __last, __val); __glibcxx_requires_partitioned_upper(__first, __last, __val);
_DistanceType __len = std::distance(__first, __last); _DistanceType __len = std::distance(__first, __last);
_DistanceType __half;
_ForwardIterator __middle, __left, __right;
while (__len > 0) while (__len > 0)
{ {
__half = __len >> 1; _DistanceType __half = __len >> 1;
__middle = __first; _ForwardIterator __middle = __first;
std::advance(__middle, __half); std::advance(__middle, __half);
if (*__middle < __val) if (*__middle < __val)
{ {
@ -2576,9 +2568,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__len = __half; __len = __half;
else else
{ {
__left = std::lower_bound(__first, __middle, __val); _ForwardIterator __left = std::lower_bound(__first, __middle,
__val);
std::advance(__first, __len); std::advance(__first, __len);
__right = std::upper_bound(++__middle, __first, __val); _ForwardIterator __right = std::upper_bound(++__middle, __first,
__val);
return pair<_ForwardIterator, _ForwardIterator>(__left, __right); return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
} }
} }
@ -2605,8 +2599,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename _ForwardIterator, typename _Tp, typename _Compare> template<typename _ForwardIterator, typename _Tp, typename _Compare>
pair<_ForwardIterator, _ForwardIterator> pair<_ForwardIterator, _ForwardIterator>
equal_range(_ForwardIterator __first, _ForwardIterator __last, equal_range(_ForwardIterator __first, _ForwardIterator __last,
const _Tp& __val, const _Tp& __val, _Compare __comp)
_Compare __comp)
{ {
typedef typename iterator_traits<_ForwardIterator>::value_type typedef typename iterator_traits<_ForwardIterator>::value_type
_ValueType; _ValueType;
@ -2625,13 +2618,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__val, __comp); __val, __comp);
_DistanceType __len = std::distance(__first, __last); _DistanceType __len = std::distance(__first, __last);
_DistanceType __half;
_ForwardIterator __middle, __left, __right;
while (__len > 0) while (__len > 0)
{ {
__half = __len >> 1; _DistanceType __half = __len >> 1;
__middle = __first; _ForwardIterator __middle = __first;
std::advance(__middle, __half); std::advance(__middle, __half);
if (__comp(*__middle, __val)) if (__comp(*__middle, __val))
{ {
@ -2643,9 +2634,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__len = __half; __len = __half;
else else
{ {
__left = std::lower_bound(__first, __middle, __val, __comp); _ForwardIterator __left = std::lower_bound(__first, __middle,
__val, __comp);
std::advance(__first, __len); std::advance(__first, __len);
__right = std::upper_bound(++__middle, __first, __val, __comp); _ForwardIterator __right = std::upper_bound(++__middle, __first,
__val, __comp);
return pair<_ForwardIterator, _ForwardIterator>(__left, __right); return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
} }
} }

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

@ -945,13 +945,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__glibcxx_requires_partitioned_lower(__first, __last, __val); __glibcxx_requires_partitioned_lower(__first, __last, __val);
_DistanceType __len = std::distance(__first, __last); _DistanceType __len = std::distance(__first, __last);
_DistanceType __half;
_ForwardIterator __middle;
while (__len > 0) while (__len > 0)
{ {
__half = __len >> 1; _DistanceType __half = __len >> 1;
__middle = __first; _ForwardIterator __middle = __first;
std::advance(__middle, __half); std::advance(__middle, __half);
if (*__middle < __val) if (*__middle < __val)
{ {