@@ -139,7 +139,7 @@ class span {
139
139
public:
140
140
using element_type = ElementType;
141
141
using value_type = typename mstd::remove_cv_t<element_type>;
142
- using index_type = size_t;
142
+ using size_type = size_t;
143
143
using difference_type = ptrdiff_t;
144
144
using pointer = element_type *;
145
145
using const_pointer = const element_type *;
@@ -148,7 +148,7 @@ public:
148
148
using iterator = pointer;
149
149
using reverse_iterator = std::reverse_iterator<iterator>;
150
150
151
- static constexpr index_type extent = Extent;
151
+ static constexpr size_type extent = Extent;
152
152
153
153
// Constructors, copy and assignment
154
154
template<size_t E = Extent,
@@ -160,7 +160,7 @@ public:
160
160
typename mstd::enable_if_t<mstd::is_convertible<
161
161
remove_reference_t<mstd::iter_reference_t<It>>(*)[],
162
162
ElementType(*)[]>::value, int> = 0>
163
- constexpr span(It ptr, index_type count) :
163
+ constexpr span(It ptr, size_type count) :
164
164
_storage(ptr, count)
165
165
{
166
166
MBED_ASSERT(extent == dynamic_extent || extent == count);
@@ -251,32 +251,32 @@ public:
251
251
return {data() + Offset, Count != dynamic_extent ? Count : size() - Offset};
252
252
}
253
253
254
- constexpr span<element_type, dynamic_extent> first(index_type count) const
254
+ constexpr span<element_type, dynamic_extent> first(size_type count) const
255
255
{
256
256
MBED_ASSERT(count <= size());
257
257
return {data(), count};
258
258
}
259
259
260
- constexpr span<element_type, dynamic_extent> last(index_type count) const
260
+ constexpr span<element_type, dynamic_extent> last(size_type count) const
261
261
{
262
262
MBED_ASSERT(count <= size());
263
263
return {data() + (size() - count), count};
264
264
}
265
265
266
266
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
268
268
{
269
269
MBED_ASSERT(offset <= size() && (count == dynamic_extent || count <= size() - offset));
270
270
return {data() + offset, count == dynamic_extent ? size() - offset : count };
271
271
}
272
272
273
273
// Observers
274
- constexpr index_type size() const noexcept
274
+ constexpr size_type size() const noexcept
275
275
{
276
276
return _storage._size;
277
277
}
278
278
279
- constexpr index_type size_bytes() const noexcept
279
+ constexpr size_type size_bytes() const noexcept
280
280
{
281
281
return size() * sizeof(element_type);
282
282
}
@@ -287,7 +287,7 @@ public:
287
287
}
288
288
289
289
// Element access
290
- constexpr reference operator[](index_type idx) const
290
+ constexpr reference operator[](size_type idx) const
291
291
{
292
292
MBED_ASSERT(idx < size());
293
293
return *(data() + idx);
@@ -336,7 +336,7 @@ private:
336
336
};
337
337
338
338
template<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;
340
340
341
341
#if __cplusplus >= 201703L || __cpp_deduction_guides >= 201703L
342
342
// Deduction guides
0 commit comments