From 203cbab5d51abafb10cec152cf08695c14472684 Mon Sep 17 00:00:00 2001 From: Christopher Di Bella Date: Tue, 7 Jul 2020 22:21:33 -0700 Subject: [PATCH] renames default_constructible --- include/concepts/concepts.hpp | 8 ++++---- include/range/v3/action/concepts.hpp | 2 +- include/range/v3/detail/variant.hpp | 4 ++-- include/range/v3/functional/not_fn.hpp | 2 +- include/range/v3/iterator/basic_iterator.hpp | 2 +- include/range/v3/utility/common_tuple.hpp | 4 ++-- include/range/v3/utility/variant.hpp | 8 ++++---- include/range/v3/view/istream.hpp | 2 +- test/algorithm/sort.cpp | 2 +- test/utility/concepts.cpp | 16 ++++++++-------- test/utility/variant.cpp | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/concepts/concepts.hpp b/include/concepts/concepts.hpp index 92f7a8c3bc..141fc39aa5 100644 --- a/include/concepts/concepts.hpp +++ b/include/concepts/concepts.hpp @@ -1134,7 +1134,7 @@ namespace concepts META_IS_CONSTRUCTIBLE(T, Args...); template - CPP_concept_bool default_constructible = + CPP_concept_bool default_initializable = constructible_from; template @@ -1183,7 +1183,7 @@ namespace concepts template CPP_concept_bool semiregular = copyable && - default_constructible; + default_initializable; // Axiom: copies are independent. See Fundamentals of Generic Programming // http://www.stepanovpapers.com/DeSt98.pdf @@ -1281,8 +1281,8 @@ namespace concepts CPP_defer_(defs::constructible_from, CPP_type(T), Args...); template - CPP_concept default_constructible = - CPP_defer(defs::default_constructible, T); + CPP_concept default_initializable = + CPP_defer(defs::default_initializable, T); template CPP_concept move_constructible = diff --git a/include/range/v3/action/concepts.hpp b/include/range/v3/action/concepts.hpp index 83d3778c37..d89fc30c3b 100644 --- a/include/range/v3/action/concepts.hpp +++ b/include/range/v3/action/concepts.hpp @@ -56,7 +56,7 @@ namespace ranges // clang-format off template CPP_concept_bool semi_container = - forward_range && default_constructible> && + forward_range && default_initializable> && movable> && !view_; diff --git a/include/range/v3/detail/variant.hpp b/include/range/v3/detail/variant.hpp index 9bde40ebdd..96b3b98427 100644 --- a/include/range/v3/detail/variant.hpp +++ b/include/range/v3/detail/variant.hpp @@ -142,7 +142,7 @@ namespace ranges CPP_member constexpr CPP_ctor(indexed_datum)()( // noexcept(std::is_nothrow_default_constructible::value) // - requires default_constructible) + requires default_initializable) : datum_{} {} CPP_template(typename... Ts)( // @@ -681,7 +681,7 @@ namespace ranges CPP_member constexpr CPP_ctor(variant)()( // noexcept(std::is_nothrow_default_constructible>::value) // - requires default_constructible>) + requires default_initializable>) : variant{emplaced_index<0>} {} CPP_template(std::size_t N, typename... Args)( // diff --git a/include/range/v3/functional/not_fn.hpp b/include/range/v3/functional/not_fn.hpp index c01f8c2114..a2daf5e600 100644 --- a/include/range/v3/functional/not_fn.hpp +++ b/include/range/v3/functional/not_fn.hpp @@ -40,7 +40,7 @@ namespace ranges CPP_member constexpr CPP_ctor(logical_negate)()( // noexcept(std::is_nothrow_default_constructible::value) // - requires default_constructible) + requires default_initializable) {} template explicit constexpr CPP_ctor(logical_negate)(T && pred)( // diff --git a/include/range/v3/iterator/basic_iterator.hpp b/include/range/v3/iterator/basic_iterator.hpp index 628358eab0..0d03ecbe6f 100644 --- a/include/range/v3/iterator/basic_iterator.hpp +++ b/include/range/v3/iterator/basic_iterator.hpp @@ -48,7 +48,7 @@ namespace ranges CPP_member constexpr CPP_ctor(basic_mixin)()( // noexcept(std::is_nothrow_default_constructible::value) // - requires default_constructible) + requires default_initializable) : box{} {} CPP_member diff --git a/include/range/v3/utility/common_tuple.hpp b/include/range/v3/utility/common_tuple.hpp index d9c2f911ec..4ffe45d089 100644 --- a/include/range/v3/utility/common_tuple.hpp +++ b/include/range/v3/utility/common_tuple.hpp @@ -116,7 +116,7 @@ namespace ranges CPP_ctor(common_tuple)()( // noexcept(meta::and_c< std::is_nothrow_default_constructible::value...>::value) // - requires default_constructible>) + requires default_initializable>) : common_tuple::forward_tuple_interface{} {} CPP_template(typename... Us)( // @@ -328,7 +328,7 @@ namespace ranges CPP_ctor(common_pair)()( // noexcept(std::is_nothrow_default_constructible::value && std::is_nothrow_default_constructible::value) // - requires default_constructible && default_constructible) + requires default_initializable && default_initializable) : std::pair{} {} template diff --git a/include/range/v3/utility/variant.hpp b/include/range/v3/utility/variant.hpp index 4cc4347e4d..c43471807d 100644 --- a/include/range/v3/utility/variant.hpp +++ b/include/range/v3/utility/variant.hpp @@ -52,7 +52,7 @@ namespace ranges public: CPP_member constexpr CPP_ctor(indexed_datum)(meta::nil_ = {})( - requires default_constructible) + requires default_initializable) : data_{} {} CPP_member @@ -67,17 +67,17 @@ namespace ranges std::uninitialized_copy_n(that.data_, N, data_); } // \pre Requires distance(first, last) <= N - // \pre Requires default_constructible || distance(first, last) == N + // \pre Requires default_initializable || distance(first, last) == N template CPP_ctor(indexed_datum)(I first, S last)( // requires sentinel_for && input_iterator && constructible_from>) { T * p = detail::uninitialized_copy(first, last, data_); - this->fill_default_(p, meta::bool_>{}); + this->fill_default_(p, meta::bool_>{}); } // \pre Requires distance(r) <= N - // \pre Requires default_constructible || distance(r) == N + // \pre Requires default_initializable || distance(r) == N template explicit CPP_ctor(indexed_datum)(R && r)( // requires input_range && constructible_from>) diff --git a/include/range/v3/view/istream.hpp b/include/range/v3/view/istream.hpp index 6d61d607c1..a66b354e49 100644 --- a/include/range/v3/view/istream.hpp +++ b/include/range/v3/view/istream.hpp @@ -101,7 +101,7 @@ namespace ranges /// \endcond template inline auto istream(std::istream & sin) -> CPP_ret(istream_view)( // - requires copy_constructible && default_constructible) + requires copy_constructible && default_initializable) { return istream_view{sin}; } diff --git a/test/algorithm/sort.cpp b/test/algorithm/sort.cpp index bfc159acff..db0fde1f44 100644 --- a/test/algorithm/sort.cpp +++ b/test/algorithm/sort.cpp @@ -223,7 +223,7 @@ namespace return a.i_ >= b.i_; } }; - CPP_assert(ranges::default_constructible); + CPP_assert(ranges::default_initializable); CPP_assert(ranges::movable); CPP_assert(ranges::totally_ordered); } diff --git a/test/utility/concepts.cpp b/test/utility/concepts.cpp index 2fd6cff4c9..0cc23a8cf7 100644 --- a/test/utility/concepts.cpp +++ b/test/utility/concepts.cpp @@ -177,14 +177,14 @@ static_assert(!ranges::movable, ""); static_assert(!ranges::semiregular, ""); static_assert(!ranges::regular, ""); -static_assert(ranges::default_constructible, ""); -static_assert(ranges::default_constructible, ""); -static_assert(!ranges::default_constructible, ""); -static_assert(!ranges::default_constructible, ""); -static_assert(!ranges::default_constructible, ""); -static_assert(!ranges::default_constructible, ""); -static_assert(ranges::default_constructible, ""); -static_assert(!ranges::default_constructible, ""); +static_assert(ranges::default_initializable, ""); +static_assert(ranges::default_initializable, ""); +static_assert(!ranges::default_initializable, ""); +static_assert(!ranges::default_initializable, ""); +static_assert(!ranges::default_initializable, ""); +static_assert(!ranges::default_initializable, ""); +static_assert(ranges::default_initializable, ""); +static_assert(!ranges::default_initializable, ""); static_assert(ranges::move_constructible, ""); static_assert(ranges::move_constructible, ""); diff --git a/test/utility/variant.cpp b/test/utility/variant.cpp index 03a9c5334e..abdddd1972 100644 --- a/test/utility/variant.cpp +++ b/test/utility/variant.cpp @@ -31,7 +31,7 @@ void bug_1217() ranges::accumulate( positions_visited, 0 ); } } - + int main() { using namespace ranges; @@ -95,7 +95,7 @@ int main() int i = 42; std::string s = "hello world"; variant v{emplaced_index<0>, i}; - CPP_assert(!default_constructible>); + CPP_assert(!default_initializable>); CHECK(v.index() == 0u); CHECK(get<0>(v) == 42); CHECK(&get<0>(v) == &i);