From a6286584e5536d1853a851b8c2ac3196956e3068 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 1 Feb 2024 10:06:15 +0000 Subject: libstdc++: Fix invalid order in PSTL inplace_merge test [PR90276] This looks like a typo in the upstream test that causes a failure in debug mode. It has been reported upstream. libstdc++-v3/ChangeLog: PR libstdc++/90276 * testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc: Fix comparison function to use less-than instead of equality. --- libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc index 576f224..a920555 100644 --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc @@ -160,7 +160,7 @@ main() test_by_type( [](std::size_t idx){ return MemoryChecker{std::int32_t(idx * 2)}; }, [](std::size_t idx){ return MemoryChecker{std::int32_t(idx * 2 + 1)}; }, - [](const MemoryChecker& val1, const MemoryChecker& val2){ return val1.value() == val2.value(); }); + [](const MemoryChecker& val1, const MemoryChecker& val2){ return val1.value() < val2.value(); }); EXPECT_FALSE(MemoryChecker::alive_objects() < 0, "wrong effect from inplace_merge: number of ctors calls < num of dtors calls"); EXPECT_FALSE(MemoryChecker::alive_objects() > 0, "wrong effect from inplace_merge: number of ctors calls > num of dtors calls"); -- cgit v1.1