diff --git a/libcxx/test/std/ranges/range.adaptors/range.join.view/iterator/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join.view/iterator/ctor.default.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.join.view/iterator/ctor.default.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.join.view/iterator/ctor.default.pass.cpp @@ -12,45 +12,46 @@ // iterator() requires default_initializable = default; -#include #include -#include "test_macros.h" +#include +#include +#include "test_iterators.h" #include "../types.h" -template -struct DefaultCtorParent : std::ranges::view_base { - T *ptr_; - constexpr DefaultCtorParent(T *ptr) : ptr_(ptr) {} - - constexpr forward_iterator begin() { return forward_iterator(ptr_); } - constexpr forward_iterator begin() const { return forward_iterator(ptr_); } - constexpr T *end() { return ptr_ + 4; } - constexpr const T *end() const { return ptr_ + 4; } +template +struct view : std::ranges::view_base { + It begin() const; + sentinel_wrapper end() const; }; -template -constexpr bool operator==(const forward_iterator &lhs, const T *rhs) { return lhs.base() == rhs; } -template -constexpr bool operator==(const T *lhs, const forward_iterator &rhs) { return rhs.base() == lhs; } - -constexpr bool test() { - using Base = DefaultCtorParent; - // Note, only the outer iterator is default_initializable: - static_assert( std::default_initializable>); - static_assert(!std::default_initializable>>); - - std::ranges::iterator_t> iter1; - (void) iter1; +template +constexpr void test_default_constructible() { + using JoinView = std::ranges::join_view>; + using JoinIterator = std::ranges::iterator_t; + static_assert(std::is_default_constructible_v); + JoinIterator it; (void)it; +} - static_assert(!std::default_initializable>>>); +template +constexpr void test_non_default_constructible() { + using JoinView = std::ranges::join_view>; + using JoinIterator = std::ranges::iterator_t; + static_assert(!std::is_default_constructible_v); +} +constexpr bool test() { + test_non_default_constructible>(); + // NOTE: cpp20_input_iterator can't be used with join_view because it is not copyable. + test_default_constructible>(); + test_default_constructible>(); + test_default_constructible>(); + test_default_constructible>(); return true; } int main(int, char**) { test(); static_assert(test()); - return 0; }