Skip to content

Commit 55b7cd6

Browse files
committed
Move from_range into details namespace
1 parent 0511601 commit 55b7cd6

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

include/beman/inplace_vector/inplace_vector.hpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,12 @@
3737
#endif
3838
#endif
3939

40-
// beman::from_range_t
41-
namespace beman {
42-
struct from_range_t {};
43-
inline constexpr from_range_t from_range;
44-
}; // namespace beman
45-
4640
// Private utilities
4741
namespace beman::inplace_vector::details {
4842

43+
struct from_range_t {};
44+
inline constexpr from_range_t from_range;
45+
4946
// clang-format off
5047
// Smallest unsigned integer that can represent values in [0, N].
5148
template <size_t N>
@@ -774,7 +771,7 @@ struct inplace_vector : public details::inplace_vector_base<T, N> {
774771
}
775772

776773
template <details::container_compatible_range<T> R>
777-
constexpr inplace_vector(beman::from_range_t, R &&rg)
774+
constexpr inplace_vector(details::from_range_t, R &&rg)
778775
requires(std::constructible_from<T, std::ranges::range_reference_t<R>> &&
779776
std::movable<T>)
780777
{
@@ -918,7 +915,7 @@ struct inplace_vector : public details::inplace_vector_base<T, N> {
918915
= delete;
919916

920917
template <details::container_compatible_range<T> R>
921-
constexpr inplace_vector(beman::from_range_t, R &&rg)
918+
constexpr inplace_vector(beman::inplace_vector::details::from_range_t, R &&rg)
922919
requires(std::constructible_from<T, std::ranges::range_reference_t<R>> &&
923920
std::movable<T>)
924921
= delete;

tests/beman/inplace_vector/constexpr.test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ template <typename IV> constexpr void test_constructors() {
7070
IV v(arr.begin(), arr.end());
7171
}
7272
{
73-
IV v(beman::from_range_t{}, arr);
73+
IV v(beman::inplace_vector::details::from_range_t{}, arr);
7474
}
7575
{
7676
IV other{0, 1};

tests/beman/inplace_vector/constructors.test.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,23 @@ TYPED_TEST(Constructors, CopyRanges) {
115115
auto reference = this->unique();
116116

117117
{
118-
IV device(beman::from_range, reference);
118+
IV device(beman::inplace_vector::details::from_range, reference);
119119
EXPECT_EQ(device, reference);
120120
}
121121

122122
if (IV::capacity() == 0)
123123
return;
124124

125125
{
126-
IV device(beman::from_range, reference | std::ranges::views::take(1));
126+
IV device(beman::inplace_vector::details::from_range,
127+
reference | std::ranges::views::take(1));
127128
EXPECT_EQ(device, IV{reference.front()});
128129
}
129130

130131
{
131132
auto mid = std::midpoint(0ul, reference.size());
132-
IV device(beman::from_range, reference | std::ranges::views::take(mid));
133+
IV device(beman::inplace_vector::details::from_range,
134+
reference | std::ranges::views::take(mid));
133135
EXPECT_EQ(device, IV(reference.begin(), reference.begin() + mid));
134136
}
135137
}

tests/beman/inplace_vector/freestanding.test.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,11 @@ TEST(Freestanding, deleted) {
160160
static_assert(!std::is_constructible_v<FIV, input_iterator, input_iterator>);
161161

162162
// constexpr inplace_vector(from_range_t, R&& rg);
163-
static_assert(std::is_constructible_v<IV, beman::from_range_t, range>);
164-
static_assert(!std::is_constructible_v<FIV, beman::from_range_t, range>);
163+
static_assert(
164+
std::is_constructible_v<IV, beman::inplace_vector::details::from_range_t,
165+
range>);
166+
static_assert(!std::is_constructible_v<
167+
FIV, beman::inplace_vector::details::from_range_t, range>);
165168

166169
// constexpr inplace_vector(initializer_list<T> il);
167170
static_assert(std::is_constructible_v<IV, initializer_list>);

0 commit comments

Comments
 (0)