aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2017-01-19 23:30:18 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2017-01-19 23:30:18 +0000
commitc4e5baa663ab629ee0f2de1e9946ab34642b5ad6 (patch)
treedf0f94109ca9d6966b92cfaa92042d975f6810b1
parent945a01f92138e0887ac258c7979392fb4661aa97 (diff)
downloadgcc-c4e5baa663ab629ee0f2de1e9946ab34642b5ad6.zip
gcc-c4e5baa663ab629ee0f2de1e9946ab34642b5ad6.tar.gz
gcc-c4e5baa663ab629ee0f2de1e9946ab34642b5ad6.tar.bz2
PR64903 fix number of predicate tests in std::is_partitioned
PR libstdc++/64903 * include/bits/stl_algo.h (is_partioned): Don't retest the partition point. * testsuite/25_algorithms/is_partitioned/2.cc: New test. From-SVN: r244661
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/stl_algo.h3
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/is_partitioned/2.cc45
3 files changed, 53 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 285a90e..31640d9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2017-01-19 Jonathan Wakely <jwakely@redhat.com>
+ PR libstdc++/64903
+ * include/bits/stl_algo.h (is_partioned): Don't retest the partition
+ point.
+ * testsuite/25_algorithms/is_partitioned/2.cc: New test.
+
* doc/xml/manual/abi.xml: Fix typo.
* doc/html/manual/abi.html: Likewise.
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index fadcf7b..8cf85aa02f 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -583,6 +583,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Predicate __pred)
{
__first = std::find_if_not(__first, __last, __pred);
+ if (__first == __last)
+ return true;
+ std::advance(__first, 1);
return std::none_of(__first, __last, __pred);
}
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_partitioned/2.cc b/libstdc++-v3/testsuite/25_algorithms/is_partitioned/2.cc
new file mode 100644
index 0000000..4b027cc
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/is_partitioned/2.cc
@@ -0,0 +1,45 @@
+// Copyright (C) 2017 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do run { target c++11 } }
+
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+// PR libstdc++/64903
+
+int count;
+
+struct pred
+{
+ bool operator()(int i) const { ++count; return i < 5; }
+};
+
+void
+test01()
+{
+ int i[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+ bool result = std::is_partitioned(i, i + 10, pred());
+ VERIFY( result );
+ VERIFY( count == 10 );
+}
+
+int
+main()
+{
+ test01();
+}