Skip to content

Commit a93cb55

Browse files
committed
Update container range references
1 parent 85f3340 commit a93cb55

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

libraries/core/src/morpheus/core/containers/concepts/associative.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include "morpheus/core/conformance/ranges.hpp"
34
#include "morpheus/core/containers/concepts/allocator_aware.hpp"
45
#include "morpheus/core/containers/concepts/detail/return_types.hpp"
56

@@ -28,8 +29,8 @@ concept Associative = AllocatorAware<T> && requires(T t,
2829
{ T(i, i, c) };
2930
{ T(i, i) };
3031
#if (__cpp_lib_containers_ranges >= 202202L)
31-
{ T(std::from_range, ranges::subrange<typename T::iterator>{}, c) };
32-
{ T(std::from_range, ranges::subrange<typename T::iterator>{}) };
32+
{ T(std::from_range, conf::ranges::subrange<typename T::iterator>{}, c) };
33+
{ T(std::from_range, conf::ranges::subrange<typename T::iterator>{}) };
3334
#endif // (__cpp_lib_containers_ranges >= 202202L)
3435
{ T(il, c) };
3536
{ T(il) };

libraries/core/src/morpheus/core/containers/concepts/sequence.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concept Sequence =
2424
{ T(s, v) };
2525
{ T(i, i) };
2626
#if (__cpp_lib_containers_ranges >= 202202L)
27-
{ T(std::from_range, ranges::subrange<typename T::iterator>{}) };
27+
{ T(std::from_range, conf::ranges::subrange<typename T::iterator>{}) };
2828
#endif // (__cpp_lib_containers_ranges >= 202202L)
2929
{ T(il) };
3030
{ t = il };
@@ -33,15 +33,15 @@ concept Sequence =
3333
{ t.insert(i, s, v) } -> std::same_as<typename T::iterator>;
3434
{ t.insert(i, i, i) } -> std::same_as<typename T::iterator>;
3535
#if (__cpp_lib_containers_ranges >= 202202L)
36-
{ t.insert_range(i, ranges::subrange<typename T::iterator>{}) } -> std::same_as<typename T::iterator>;
36+
{ t.insert_range(i, conf::ranges::subrange<typename T::iterator>{}) } -> std::same_as<typename T::iterator>;
3737
#endif // (__cpp_lib_containers_ranges >= 202202L)
3838
{ t.insert(i, il) } -> std::same_as<typename T::iterator>;
3939
{ t.erase(i) } -> std::same_as<typename T::iterator>;
4040
{ t.erase(i, i) } -> std::same_as<typename T::iterator>;
4141
{ t.clear() } -> std::same_as<void>;
4242
{ t.assign(i, i) } -> std::same_as<void>;
4343
#if (__cpp_lib_containers_ranges >= 202202L)
44-
{ t.assign_range(ranges::subrange<typename T::iterator>{}) } -> std::same_as<void>;
44+
{ t.assign_range(conf::ranges::subrange<typename T::iterator>{}) } -> std::same_as<void>;
4545
#endif // (__cpp_lib_containers_ranges >= 202202L)
4646
{ t.assign(il) } -> std::same_as<void>;
4747
{ t.assign(s, v) } -> std::same_as<void>;

libraries/core/testing/morpheus/containers/concepts/archetypes/associative.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ struct Associative
112112
constexpr Associative(iterator, iterator);
113113
#if (__cpp_lib_containers_ranges >= 202202L)
114114
/// Construct the container from a range and key comparison function.
115-
constexpr Associative(std::from_range_t, ranges::range auto, key_compare const&);
115+
constexpr Associative(std::from_range_t, conf::ranges::range auto, key_compare const&);
116116
/// Construct the container from a range.
117-
constexpr Associative(std::from_range_t, ranges::range auto);
117+
constexpr Associative(std::from_range_t, conf::ranges::range auto);
118118
#endif // (__cpp_lib_containers_ranges >= 202202L)
119119
/// Construct the container from an initializer list and key comparison function.
120120
constexpr Associative(std::initializer_list<value_type>, key_compare const&);
@@ -146,7 +146,7 @@ struct Associative
146146
constexpr iterator insert(const_iterator, value_type);
147147
constexpr void insert(const_iterator, const_iterator);
148148
#if (__cpp_lib_containers_ranges >= 202202L)
149-
constexpr void insert_range(ranges::range auto);
149+
constexpr void insert_range(conf::ranges::range auto);
150150
#endif // (__cpp_lib_containers_ranges >= 202202L)
151151
constexpr void insert(std::initializer_list<value_type>);
152152
constexpr InsertNodeHandleReturnType insert(node_type&&);

libraries/core/testing/morpheus/containers/concepts/archetypes/sequence.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct Sequence : Container
2222
constexpr Sequence(size_type, value_type);
2323
constexpr Sequence(iterator, iterator);
2424
#if (__cpp_lib_containers_ranges >= 202202L)
25-
constexpr Sequence(std::from_range_t, ranges::range auto);
25+
constexpr Sequence(std::from_range_t, conf::ranges::range auto);
2626
#endif // (__cpp_lib_containers_ranges >= 202202L)
2727
constexpr Sequence(std::initializer_list<int>);
2828
constexpr Sequence(Sequence const&);
@@ -38,15 +38,15 @@ struct Sequence : Container
3838
constexpr iterator insert(iterator, size_type, value_type);
3939
constexpr iterator insert(iterator, iterator, iterator);
4040
#if (__cpp_lib_containers_ranges >= 202202L)
41-
constexpr iterator insert_range(iterator, ranges::range auto);
41+
constexpr iterator insert_range(iterator, conf::ranges::range auto);
4242
#endif // (__cpp_lib_containers_ranges >= 202202L)
4343
constexpr iterator insert(iterator, std::initializer_list<int>);
4444
constexpr iterator erase(iterator);
4545
constexpr iterator erase(iterator, iterator);
4646
constexpr void clear();
4747
constexpr void assign(iterator, iterator);
4848
#if (__cpp_lib_containers_ranges >= 202202L)
49-
constexpr void assign_range(ranges::range auto);
49+
constexpr void assign_range(conf::ranges::range auto);
5050
#endif // (__cpp_lib_containers_ranges >= 202202L)
5151
constexpr void assign(std::initializer_list<int>);
5252
constexpr void assign(size_type, value_type);

0 commit comments

Comments
 (0)