ac73c944ea
This avoids including the whole of <functional> in <algorithm>, as the <pstl/glue_algorithm_defs.h> header only actually needs std::pair. This also avoids including <iterator> in <pstl/utils.h>, which only needs <type_traits>, std::bad_alloc, and std::terminate (which can be repalced with std::__terminate). This matters less, because <pstl/utils.h> is only included by the <pstl/*_impl.h> headers and they all use <iterator> anyway, and are only included by <execution>. libstdc++-v3/ChangeLog: PR libstdc++/92546 * include/pstl/glue_algorithm_defs.h: Replace <functional> with <bits/stl_pair.h>. * include/pstl/utils.h: Replace <iterator> with <type_traits>. (__pstl::__internal::__except_handler): Use std::__terminate instead of std::terminate. * src/c++17/fs_path.cc: Include <array>. * testsuite/25_algorithms/adjacent_find/constexpr.cc: Include <functional>. * testsuite/25_algorithms/binary_search/constexpr.cc: Likewise. * testsuite/25_algorithms/clamp/constrained.cc: Likewise. * testsuite/25_algorithms/equal/constrained.cc: Likewise. * testsuite/25_algorithms/for_each/constrained.cc: Likewise. * testsuite/25_algorithms/includes/constrained.cc: Likewise. * testsuite/25_algorithms/is_heap/constexpr.cc: Likewise. * testsuite/25_algorithms/is_heap_until/constexpr.cc: Likewise. * testsuite/25_algorithms/is_permutation/constrained.cc: Include <iterator>. * testsuite/25_algorithms/is_sorted/constexpr.cc: Include <functional>. * testsuite/25_algorithms/is_sorted_until/constexpr.cc: Likewise. * testsuite/25_algorithms/lexicographical_compare/constexpr.cc: Likewise. * testsuite/25_algorithms/lexicographical_compare/constrained.cc: Likewise. * testsuite/25_algorithms/lexicographical_compare_three_way/1.cc: Include <array>. * testsuite/25_algorithms/lower_bound/constexpr.cc: Include <functional>. * testsuite/25_algorithms/max/constrained.cc: Likewise. * testsuite/25_algorithms/max_element/constrained.cc: Likewise. * testsuite/25_algorithms/min/constrained.cc: Likewise. * testsuite/25_algorithms/min_element/constrained.cc: Likewise. * testsuite/25_algorithms/minmax_element/constrained.cc: Likewise. * testsuite/25_algorithms/mismatch/constexpr.cc: Likewise. * testsuite/25_algorithms/move/93872.cc: Likewise. * testsuite/25_algorithms/move_backward/93872.cc: Include <iterator>. * testsuite/25_algorithms/nth_element/constexpr.cc: Include <functional>. * testsuite/25_algorithms/partial_sort/constexpr.cc: Likewise. * testsuite/25_algorithms/partial_sort_copy/constexpr.cc: Likewise. * testsuite/25_algorithms/search/constexpr.cc: Likewise. * testsuite/25_algorithms/search_n/constrained.cc: Likewise. * testsuite/25_algorithms/set_difference/constexpr.cc: Likewise. * testsuite/25_algorithms/set_difference/constrained.cc: Likewise. * testsuite/25_algorithms/set_intersection/constexpr.cc: Likewise. * testsuite/25_algorithms/set_intersection/constrained.cc: Likewise. * testsuite/25_algorithms/set_symmetric_difference/constexpr.cc: Likewise. * testsuite/25_algorithms/set_union/constexpr.cc: Likewise. * testsuite/25_algorithms/set_union/constrained.cc: Likewise. * testsuite/25_algorithms/sort/constexpr.cc: Likewise. * testsuite/25_algorithms/sort_heap/constexpr.cc: Likewise. * testsuite/25_algorithms/transform/constrained.cc: Likewise. * testsuite/25_algorithms/unique/constexpr.cc: Likewise. * testsuite/25_algorithms/unique/constrained.cc: Likewise. * testsuite/25_algorithms/unique_copy/constexpr.cc: Likewise. * testsuite/25_algorithms/upper_bound/constexpr.cc: Likewise. * testsuite/std/ranges/adaptors/elements.cc: Include <vector>. * testsuite/std/ranges/adaptors/lazy_split.cc: Likewise. * testsuite/std/ranges/adaptors/split.cc: Likewise.
98 lines
2.9 KiB
C++
98 lines
2.9 KiB
C++
// Copyright (C) 2020-2022 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-options "-std=gnu++2a" }
|
|
// { dg-do run { target c++2a } }
|
|
|
|
#include <algorithm>
|
|
#include <functional>
|
|
#include <testsuite_hooks.h>
|
|
#include <testsuite_iterators.h>
|
|
|
|
using __gnu_test::test_container;
|
|
using __gnu_test::test_range;
|
|
using __gnu_test::input_iterator_wrapper;
|
|
using __gnu_test::forward_iterator_wrapper;
|
|
using __gnu_test::bidirectional_iterator_wrapper;
|
|
|
|
namespace ranges = std::ranges;
|
|
|
|
struct X { int i; };
|
|
|
|
void
|
|
test01()
|
|
{
|
|
int x[] = { {2}, {2}, {6}, {8}, {10}, {11}, {11} };
|
|
int y[] = { {2}, {2}, {6}, {8}, {10}, {11}, {11} };
|
|
X z[] = { {2}, {6}, {8}, {10}, {2}, {2} };
|
|
int w[] = { {1}, {1}, {1}, {1}, {1} };
|
|
|
|
VERIFY( ranges::equal(w, w+4, w+1, w+5) );
|
|
VERIFY( ranges::equal(w, w+5, w, w+5, ranges::greater{},
|
|
[] (int a) { return a+1; }) );
|
|
|
|
test_container<int, forward_iterator_wrapper> cx(x), cy(y);
|
|
test_container<X, forward_iterator_wrapper> cz(z);
|
|
VERIFY( ranges::equal(cx, cy) );
|
|
VERIFY( !ranges::equal(cx, cy, {}, [] (int a) { return a+1; }) );
|
|
VERIFY( !ranges::equal(cx, cz, {}, {}, &X::i) );
|
|
|
|
test_range<int, input_iterator_wrapper> rx(x), ry(y);
|
|
test_range<X, input_iterator_wrapper> rz(z);
|
|
VERIFY( ranges::equal(rx, ry) );
|
|
|
|
rx.bounds.first = x;
|
|
ry.bounds.first = y;
|
|
VERIFY( !ranges::equal(rx, ry, {}, {}, [] (int a) { return a+1; }) );
|
|
|
|
rx.bounds.first = x;
|
|
rz.bounds.first = z;
|
|
VERIFY( !ranges::equal(rx, rz, {}, {}, &X::i) );
|
|
}
|
|
|
|
void
|
|
test02()
|
|
{
|
|
static constexpr X x[] = { {2}, {2}, {6}, {8}, {10}, {11} };
|
|
static constexpr X y[] = { {2}, {6}, {8}, {10}, {11}, {2} };
|
|
static constexpr int z[] = { {2}, {6}, {8}, {10}, {2}, {2} };
|
|
static constexpr int w[] = { {2}, {6}, {8}, {10}, {2}, {2} };
|
|
|
|
static_assert(ranges::equal(z, w));
|
|
static_assert(!ranges::equal(z, z+5, w+1, w+6));
|
|
static_assert(!ranges::equal(z, z, {}, {}, [] (int a) { return a+1; }));
|
|
static_assert(!ranges::equal(x, y, {}, &X::i, &X::i));
|
|
}
|
|
|
|
void
|
|
test03()
|
|
{
|
|
std::vector<int> x = { {2}, {2}, {6}, {8}, {10}, {11} };
|
|
std::vector<int> y = { {2}, {2}, {6}, {8}, {10}, {11} };
|
|
std::vector<int> z = { {2}, {2}, {6}, {8}, {10}, {12} };
|
|
VERIFY( ranges::equal(x, y) );
|
|
VERIFY( !ranges::equal(x, z) );
|
|
}
|
|
|
|
int
|
|
main()
|
|
{
|
|
test01();
|
|
test02();
|
|
test03();
|
|
}
|