re PR libstdc++/27162 (search_n uses == when it should use binary_pred)

2006-04-14  Douglas Gregor  <dgregor@cs.indiana.edu>

	PR libstdc++/27162
	* include/bits/stl_algo.h (__search_n(,,,, _BinaryPredicate,
	std::forward_iterator_tag)): Use __binary_pred, not ==.

From-SVN: r112957

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2fcdcfaae4e694714e118060632b118e7420b270..93172b64246c1ec8939185b4ddd40777d9cb5c30 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Douglas Gregor  <dgregor@cs.indiana.edu>
+
+       PR libstdc++/27162
+       * include/bits/stl_algo.h (__search_n(,,,, _BinaryPredicate,
+       std::forward_iterator_tag)): Use __binary_pred, not ==.
+
 2006-04-10  Matthias Klose  <doko@debian.org>
 
        * testsuite/lib/libstdc++.exp (libstdc++_init): Recognize multilib

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 7c54f50b4f76d532e36c645f715492da5f2f4879..8da0613d87de959a37e8491bfe837fe0a6a2a949 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -759,7 +759,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
            __n = __count;
          _ForwardIterator __i = __first;
          ++__i;
-         while (__i != __last && __n != 1 && *__i == __val)
+         while (__i != __last && __n != 1 && __binary_pred(*__i, __val))
            {
              ++__i;
              --__n;