|
4 | 4 | #include <stdx/compiler.hpp> |
5 | 5 | #include <stdx/concepts.hpp> |
6 | 6 | #include <stdx/iterator.hpp> |
7 | | -#include <stdx/memory.hpp> |
8 | 7 | #include <stdx/type_traits.hpp> |
9 | 8 |
|
10 | 9 | #include <algorithm> |
11 | 10 | #include <array> |
12 | 11 | #include <cstddef> |
13 | 12 | #include <iterator> |
14 | 13 | #include <limits> |
| 14 | +#include <memory> |
15 | 15 | #include <type_traits> |
16 | 16 |
|
17 | 17 | namespace stdx { |
@@ -85,12 +85,12 @@ class span : public detail::span_base<T, Extent> { |
85 | 85 | template <typename It, typename SizeOrEnd> |
86 | 86 | requires(dependent_extent<It> != dynamic_extent) |
87 | 87 | explicit constexpr span(It first, SizeOrEnd) |
88 | | - : ptr{stdx::to_address(first)} {} |
| 88 | + : ptr{std::to_address(first)} {} |
89 | 89 |
|
90 | 90 | template <typename It, typename SizeOrEnd> |
91 | 91 | requires(dependent_extent<It> == dynamic_extent) |
92 | 92 | constexpr span(It first, SizeOrEnd sore) |
93 | | - : base_t{first, sore}, ptr{stdx::to_address(first)} {} |
| 93 | + : base_t{first, sore}, ptr{std::to_address(first)} {} |
94 | 94 |
|
95 | 95 | template <typename U, std::size_t N> |
96 | 96 | constexpr explicit(false) span(std::array<U, N> &arr LIFETIMEBOUND) noexcept |
@@ -120,13 +120,13 @@ class span : public detail::span_base<T, Extent> { |
120 | 120 | template <typename R> |
121 | 121 | requires(dependent_extent<R> != dynamic_extent) |
122 | 122 | explicit constexpr span(R &&r) |
123 | | - : ptr{stdx::to_address(std::begin(std::forward<R>(r)))} {} |
| 123 | + : ptr{std::to_address(std::begin(std::forward<R>(r)))} {} |
124 | 124 |
|
125 | 125 | template <typename R> |
126 | 126 | requires(dependent_extent<R> == dynamic_extent) |
127 | 127 | explicit constexpr span(R &&r) |
128 | 128 | : base_t{std::begin(std::forward<R>(r)), std::end(std::forward<R>(r))}, |
129 | | - ptr{stdx::to_address(std::begin(std::forward<R>(r)))} {} |
| 129 | + ptr{std::to_address(std::begin(std::forward<R>(r)))} {} |
130 | 130 |
|
131 | 131 | template <class U, std::size_t N> |
132 | 132 | requires(dependent_extent<U> != dynamic_extent and N == dynamic_extent) |
|
0 commit comments