Reapply "[libc++] Add test_iterators.h to the modulemap (#181351)"

Another test committed recently was missing an include.

This reverts commit ab88d9af5371ef62a636fc780c88cf6d3487c584.

libcxx/include/module.modulemap.in

@@ -469,6 +469,7 @@ module std [system] {
     module mismatch {
       header "__algorithm/mismatch.h"
       export std.utility.pair // return type
+      export std.iterator.aliasing_iterator
     }
     module move_backward                          { header "__algorithm/move_backward.h" }
     module move                                   { header "__algorithm/move.h" }

libcxx/test/benchmarks/containers/sequence/sequence_container_benchmarks.h

@@ -21,6 +21,7 @@
 
 #include "benchmark/benchmark.h"
 #include "test_iterators.h"
+#include "test_macros.h"
 #include "../../GenerateInput.h"
 
 namespace support {

libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_forward_iterator.compile.pass.cpp

@@ -11,6 +11,7 @@
 // template<class I>
 // concept __nothrow_forward_iterator;
 
+#include <iterator>
 #include <memory>
 
 #include "test_iterators.h"

libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp

@@ -11,6 +11,7 @@
 // template<class I>
 // concept __nothrow_input_iterator;
 
+#include <iterator>
 #include <memory>
 
 #include "test_iterators.h"

libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp

@@ -22,6 +22,7 @@
 #include <filesystem>
 #include <type_traits>
 #include <cassert>
+#include <utility>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/libcxx/iterators/bounded_iter/arithmetic.pass.cpp

@@ -12,6 +12,7 @@
 // Arithmetic operators
 
 #include <__iterator/bounded_iter.h>
+#include <cassert>
 #include <cstddef>
 
 #include "test_iterators.h"

libcxx/test/libcxx/iterators/bounded_iter/comparison.pass.cpp

@@ -11,6 +11,8 @@
 //
 // Comparison operators
 
+#include <cassert>
+#include <compare>
 #include <concepts>
 #include <__iterator/bounded_iter.h>
 

libcxx/test/libcxx/iterators/capacity_aware_iter/arithmetic.pass.cpp

@@ -25,6 +25,7 @@
 // operator-(__capacity_aware_iterator, __capacity_aware_iterator)
 
 #include <__iterator/capacity_aware_iterator.h>
+#include <cassert>
 #include <concepts>
 #include <cstddef>
 #include <iterator>

libcxx/test/libcxx/iterators/capacity_aware_iter/comparison.pass.cpp

@@ -22,6 +22,7 @@
 // operator<=>
 
 #include <__iterator/capacity_aware_iterator.h>
+#include <cassert>
 #include <compare>
 #include <concepts>
 #include <iterator>

libcxx/test/libcxx/iterators/capacity_aware_iter/dereference.pass.cpp

@@ -18,7 +18,9 @@
 // operator->();
 
 #include <__iterator/capacity_aware_iterator.h>
+#include <cassert>
 #include <concepts>
+#include <iterator>
 
 #include "test_iterators.h"
 #include "test_macros.h"

libcxx/test/libcxx/iterators/iterator.requirements/iterator.concepts/cpp20_iter_traits.compile.pass.cpp

@@ -15,6 +15,7 @@
 // ITER_TRAITS(I) denotes iterator_traits<I>.
 
 #include <__iterator/concepts.h>
+#include <iterator>
 #include <type_traits>
 
 #include "test_iterators.h"

libcxx/test/libcxx/iterators/iterator_with_data.pass.cpp

@@ -15,6 +15,10 @@ TEST_CLANG_DIAGNOSTIC_IGNORED("-Wprivate-header")
 #include <__iterator/iterator_with_data.h>
 TEST_DIAGNOSTIC_POP
 
+#include <cassert>
+#include <iterator>
+#include <utility>
+
 #include "test_iterators.h"
 
 static_assert(std::forward_iterator<std::__iterator_with_data<forward_iterator<int*>, int>>);

libcxx/test/libcxx/iterators/product_iterator.pass.cpp

@@ -10,6 +10,7 @@
 // gcc 15 does not seem to recognize the __product_iterator_traits specializations
 // UNSUPPORTED: gcc
 
+#include <cassert>
 #include <flat_map>
 #include <ranges>
 #include <type_traits>

libcxx/test/libcxx/iterators/unwrap_iter.pass.cpp

@@ -12,6 +12,7 @@
 #include <cassert>
 #include <string>
 #include <type_traits>
+#include <utility>
 
 #include "test_iterators.h"
 #include "test_macros.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <vector>
 
 #include "sized_allocator.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <vector>
 
 #include "sized_allocator.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <vector>
 
 #include "test_macros.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy.pass.cpp

@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <cstdint>
 #include <deque>
 #include <ranges>
 #include <vector>

libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_backward.pass.cpp

@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <cstdint>
 #include <deque>
 #include <ranges>
 #include <vector>

libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_n.pass.cpp

@@ -24,6 +24,7 @@
 #include "almost_satisfies_types.h"
 #include "test_macros.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 template <class In, class Out = In, class Count = std::size_t>
 concept HasCopyNIt = requires(In in, Count count, Out out) { std::ranges::copy_n(in, count, out); };

libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp

@@ -17,6 +17,7 @@
 #include <array>
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
 #include <deque>
 #include <ranges>
 #include <vector>

libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp

@@ -17,6 +17,7 @@
 #include <array>
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
 #include <deque>
 #include <ranges>
 #include <vector>

libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill.pass.cpp

@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <cstdint>
 #include <deque>
 #include <ranges>
 #include <string>

libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill_n.pass.cpp

@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <cstdint>
 #include <deque>
 #include <ranges>
 #include <string>

libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate.pass.cpp

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate_n.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp

@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <iterator>
 #include <memory>
 #include <vector>

libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <iterator>
 #include <memory>
 #include <vector>

libcxx/test/std/algorithms/alg.modifying.operations/alg.move/pstl.move.pass.cpp

@@ -18,6 +18,7 @@
 //                         ForwardIterator2 result);
 
 #include <algorithm>
+#include <cassert>
 #include <vector>
 
 #include "test_macros.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp

@@ -13,9 +13,10 @@
 //     is_partitioned(InputIterator first, InputIterator last, Predicate pred);
 
 #include <algorithm>
-#include <functional>
-#include <cstddef>
 #include <cassert>
+#include <cstddef>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_copy.pass.cpp

@@ -28,6 +28,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_point.pass.cpp

@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_stable_partition.pass.cpp

@@ -24,12 +24,14 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>
 
 #include "almost_satisfies_types.h"
 #include "test_iterators.h"
+#include "test_macros.h"
 
 struct UnaryPred { bool operator()(int) const; };
 

libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/ranges_sample.pass.cpp

@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <random>

libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp

@@ -17,10 +17,12 @@
 //                       UniformRandomNumberGenerator &&g);
 
 #include <algorithm>
-#include <random>
-#include <type_traits>
 #include <cassert>
 #include <cstddef>
+#include <iterator>
+#include <random>
+#include <type_traits>
+#include <utility>
 
 #include "test_iterators.h"
 #include "test_macros.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.random.shuffle/ranges_shuffle.pass.cpp

@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <random>

libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy.pass.cpp

@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy_if.pass.cpp

@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 #include <memory>
 
 #include "test_macros.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp

@@ -15,8 +15,9 @@
 //   remove_copy_if(InIter first, InIter last, OutIter result, Pred pred);
 
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp

@@ -18,6 +18,7 @@
 #include <functional>
 #include <cassert>
 #include <memory>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy.pass.cpp

@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy_if.pass.cpp

@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp

@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp

@@ -17,8 +17,9 @@
 //   replace_copy_if(InIter first, InIter last, OutIter result, Pred pred, const T& new_value);
 
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp

@@ -16,8 +16,9 @@
 //   replace_if(Iter first, Iter last, Pred pred, const T& new_value);
 
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/ranges.reverse.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <ranges>
 

libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/ranges.shift_left.pass.cpp

@@ -26,8 +26,9 @@
 #include <vector>
 
 #include "almost_satisfies_types.h"
-#include "test_iterators.h"
 #include "MoveOnly.h"
+#include "test_iterators.h"
+#include "type_algorithms.h"
 
 struct InvalidDifferenceT {};
 

libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/ranges_shift_right.pass.cpp

@@ -25,9 +25,10 @@
 #include <vector>
 
 #include "almost_satisfies_types.h"
+#include "MoveOnly.h"
 #include "test_macros.h"
 #include "test_iterators.h"
-#include "MoveOnly.h"
+#include "type_algorithms.h"
 
 struct InvalidDifferenceT {};
 

libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_left.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_right.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp

@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <functional>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.binary.pass.cpp

@@ -21,11 +21,13 @@
 //               BinaryOperation binary_op);
 
 #include <algorithm>
+#include <cassert>
 #include <vector>
 
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(transform);
 

libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.unary.pass.cpp

@@ -26,6 +26,7 @@
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 // We can't test the constraint on the execution policy, because that would conflict with the binary
 // transform algorithm that doesn't take an execution policy, which is not constrained at all.

libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp

@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <functional>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique.pass.cpp

@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique_copy.pass.cpp

@@ -30,6 +30,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <concepts>
 #include <functional>
 #include <ranges>

libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp

@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <cassert>
 #include <memory>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp

@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "MoveOnly.h"
 #include "test_macros.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp

@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <cassert>
 #include <memory>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp

@@ -14,8 +14,9 @@
 //   adjacent_find(Iter first, Iter last, Pred pred);
 
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/pstl.all_of.pass.cpp

@@ -23,6 +23,7 @@
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(all_of);
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/pstl.any_of.pass.cpp

@@ -23,6 +23,7 @@
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(any_of);
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.contains/ranges.contains.pass.cpp

@@ -29,6 +29,7 @@
 #include "almost_satisfies_types.h"
 #include "boolean_testable.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 struct NotEqualityComparable {};
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp

@@ -14,8 +14,9 @@
 //   count_if(Iter first, Iter last, Pred pred);
 
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count.pass.cpp

@@ -20,11 +20,13 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <iterator>
 #include <vector>
 
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(count);
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count_if.pass.cpp

@@ -20,11 +20,13 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <iterator>
 #include <vector>
 
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(count_if);
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.ends_with/ranges.ends_with.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <chrono>
 #include <ranges>
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp

@@ -30,6 +30,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <functional>
 #include <vector>
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp

@@ -21,10 +21,10 @@
 //   constexpr bool     // constexpr after c++17
 //   equal(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred);
 
-
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/pstl.equal.pass.cpp

@@ -42,6 +42,7 @@
 #include "test_execution_policies.h"
 #include "test_iterators.h"
 #include "test_macros.h"
+#include "type_algorithms.h"
 
 template <class It1, class It2>
 struct Test {

libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/ranges.equal.pass.cpp

@@ -26,6 +26,7 @@
 #include <array>
 #include <cassert>
 #include <concepts>
+#include <cstdint>
 #include <functional>
 #include <ranges>
 #include <vector>

libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp

@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <functional>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/ranges.find_end.pass.cpp

@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <ranges>
 
 #include "almost_satisfies_types.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp

@@ -15,8 +15,9 @@
 //   find_first_of(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred);
 
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/ranges.find_first_of.pass.cpp

@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <functional>
 #include <ranges>
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp

@@ -31,6 +31,7 @@
 
 #include "almost_satisfies_types.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 struct NotEqualityComparable {};
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp

@@ -28,7 +28,9 @@
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
 #include <deque>
+#include <ranges>
 #include <vector>
 #include <type_traits>
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp

@@ -12,8 +12,9 @@
 //   constexpr InputIterator find_if(InputIterator first, InputIterator last, Predicate pred); // constexpr since C++20
 
 #include <algorithm>
-#include <functional>
 #include <cassert>
+#include <functional>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp

@@ -15,6 +15,7 @@
 #include <algorithm>
 #include <functional>
 #include <cassert>
+#include <iterator>
 
 #include "test_macros.h"
 #include "test_iterators.h"

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find.pass.cpp

@@ -23,6 +23,7 @@
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(find);
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if.pass.cpp

@@ -23,6 +23,7 @@
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(find_if);
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if_not.pass.cpp

@@ -23,6 +23,7 @@
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 EXECUTION_POLICY_SFINAE_TEST(find_if_not);
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/ranges.find.pass.cpp

@@ -29,6 +29,7 @@
 #include <array>
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
 #include <deque>
 #include <ranges>
 #include <vector>
@@ -36,6 +37,7 @@
 #include "almost_satisfies_types.h"
 #include "sized_allocator.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 struct NotEqualityComparable {};
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.fold/requirements.compile.pass.cpp

@@ -32,6 +32,7 @@
 #include <functional>
 #include <iterator>
 #include <ranges>
+#include <type_traits>
 
 #include "test_iterators.h"
 

libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each.pass.cpp

@@ -20,6 +20,7 @@
 
 #include "test_macros.h"
 #include "test_iterators.h"
+#include "type_algorithms.h"
 
 struct for_each_test {
   TEST_CONSTEXPR for_each_test(int c) : count(c) {}

libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each.pass.cpp

@@ -25,6 +25,7 @@
 #include "test_macros.h"
 #include "test_execution_policies.h"
 #include "test_iterators.h"
+#include <type_algorithms.h>
 
 EXECUTION_POLICY_SFINAE_TEST(for_each);