@@ -139,7 +139,7 @@ class span {
139139public:
140140 using element_type = ElementType;
141141 using value_type = typename mstd::remove_cv_t<element_type>;
142- using index_type = size_t;
142+ using size_type = size_t;
143143 using difference_type = ptrdiff_t;
144144 using pointer = element_type *;
145145 using const_pointer = const element_type *;
@@ -148,7 +148,7 @@ public:
148148 using iterator = pointer;
149149 using reverse_iterator = std::reverse_iterator<iterator>;
150150
151- static constexpr index_type extent = Extent;
151+ static constexpr size_type extent = Extent;
152152
153153 // Constructors, copy and assignment
154154 template<size_t E = Extent,
@@ -160,7 +160,7 @@ public:
160160 typename mstd::enable_if_t<mstd::is_convertible<
161161 remove_reference_t<mstd::iter_reference_t<It>>(*)[],
162162 ElementType(*)[]>::value, int> = 0>
163- constexpr span(It ptr, index_type count) :
163+ constexpr span(It ptr, size_type count) :
164164 _storage(ptr, count)
165165 {
166166 MBED_ASSERT(extent == dynamic_extent || extent == count);
@@ -251,32 +251,32 @@ public:
251251 return {data() + Offset, Count != dynamic_extent ? Count : size() - Offset};
252252 }
253253
254- constexpr span<element_type, dynamic_extent> first(index_type count) const
254+ constexpr span<element_type, dynamic_extent> first(size_type count) const
255255 {
256256 MBED_ASSERT(count <= size());
257257 return {data(), count};
258258 }
259259
260- constexpr span<element_type, dynamic_extent> last(index_type count) const
260+ constexpr span<element_type, dynamic_extent> last(size_type count) const
261261 {
262262 MBED_ASSERT(count <= size());
263263 return {data() + (size() - count), count};
264264 }
265265
266266 constexpr span<element_type, dynamic_extent>
267- subspan(index_type offset, index_type count = dynamic_extent) const
267+ subspan(size_type offset, size_type count = dynamic_extent) const
268268 {
269269 MBED_ASSERT(offset <= size() && (count == dynamic_extent || count <= size() - offset));
270270 return {data() + offset, count == dynamic_extent ? size() - offset : count };
271271 }
272272
273273 // Observers
274- constexpr index_type size() const noexcept
274+ constexpr size_type size() const noexcept
275275 {
276276 return _storage._size;
277277 }
278278
279- constexpr index_type size_bytes() const noexcept
279+ constexpr size_type size_bytes() const noexcept
280280 {
281281 return size() * sizeof(element_type);
282282 }
@@ -287,7 +287,7 @@ public:
287287 }
288288
289289 // Element access
290- constexpr reference operator[](index_type idx) const
290+ constexpr reference operator[](size_type idx) const
291291 {
292292 MBED_ASSERT(idx < size());
293293 return *(data() + idx);
@@ -336,7 +336,7 @@ private:
336336};
337337
338338template<typename ElementType, size_t Extent>
339- constexpr span<ElementType, Extent>::index_type span<ElementType, Extent>::extent;
339+ constexpr span<ElementType, Extent>::size_type span<ElementType, Extent>::extent;
340340
341341#if __cplusplus >= 201703L || __cpp_deduction_guides >= 201703L
342342// Deduction guides
0 commit comments