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

stl_algo.h (search(_ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2)): Tidy. 

2007-07-09  Jim Xochellis  <jimxoch@yahoo.gr>
	    Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_algo.h (search(_ForwardIterator1,
	_ForwardIterator1, _ForwardIterator2, _ForwardIterator2)): Tidy.
	(search(_ForwardIterator1, _ForwardIterator1, _ForwardIterator2,
	_ForwardIterator2, _BinaryPredicate)): Likewise.

Co-Authored-By: Paolo Carlini <pcarlini@suse.de>

From-SVN: r126479
This commit is contained in:
Jim Xochellis 2007-07-09 12:00:34 +03:00 committed by Paolo Carlini
parent 57728874d2
commit 58b9f26a61
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2007-07-09 Jim Xochellis <jimxoch@yahoo.gr>
Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (search(_ForwardIterator1,
_ForwardIterator1, _ForwardIterator2, _ForwardIterator2)): Tidy.
(search(_ForwardIterator1, _ForwardIterator1, _ForwardIterator2,
_ForwardIterator2, _BinaryPredicate)): Likewise.
2007-07-06 Hans-Peter Nilsson <hp@axis.com>
* testsuite/lib/libstdc++.exp (v3-build_support): Use env(AR)

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

@ -624,19 +624,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
typename iterator_traits<_ForwardIterator2>::value_type>)
__glibcxx_requires_valid_range(__first1, __last1);
__glibcxx_requires_valid_range(__first2, __last2);
// Test for empty ranges
if (__first1 == __last1 || __first2 == __last2)
return __first1;
// Test for a pattern of length 1.
_ForwardIterator2 __tmp(__first2);
++__tmp;
if (__tmp == __last2)
_ForwardIterator2 __p1(__first2);
if (++__p1 == __last2)
return std::find(__first1, __last1, *__first2);
// General case.
_ForwardIterator2 __p1, __p;
__p1 = __first2; ++__p1;
_ForwardIterator2 __p;
_ForwardIterator1 __current = __first1;
for (;;)
@ -703,9 +702,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return __first1;
// Test for a pattern of length 1.
_ForwardIterator2 __tmp(__first2);
++__tmp;
if (__tmp == __last2)
_ForwardIterator2 __p1(__first2);
if (++__p1 == __last2)
{
while (__first1 != __last1
&& !bool(__predicate(*__first1, *__first2)))
@ -714,8 +712,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
}
// General case.
_ForwardIterator2 __p1, __p;
__p1 = __first2; ++__p1;
_ForwardIterator2 __p;
_ForwardIterator1 __current = __first1;
for (;;)