stl_algo.h (search(_ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardI...

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 311d1e19b03c01de160dcd740b343e5ac9104b08..0c38956f52c2b4c1db90b642cd9086007ebd0f7a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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)

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 2befdb2bfcd5e8b74d02c950461ca9bc7258ba94..160dc2f8abc43d5bc779fc8b363d9b1b81c97e64 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -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 (;;)