From: Douglas Gregor <dgregor@cs.indiana.edu>
Date: Fri, 14 Apr 2006 17:35:06 +0000 (+0000)
Subject: re PR libstdc++/27162 (search_n uses == when it should use binary_pred)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=008712ae1cf581c664f18f44ccac6d36ccbf3b93;p=gcc.git

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 2fcdcfaae4e..93172b64246 100644
--- 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 7c54f50b4f7..8da0613d87d 100644
--- 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;