@@ -205,15 +205,15 @@ public:
205
205
{
206
206
static_assert(Count <= extent);
207
207
MBED_ASSERT(Count <= size());
208
- return span<element_type, Count>( data(), Count) ;
208
+ return { data(), Count} ;
209
209
}
210
210
211
211
template<size_t Count>
212
212
constexpr span<element_type, Count> last() const
213
213
{
214
214
static_assert(Count <= extent);
215
215
MBED_ASSERT(Count <= size());
216
- return span<element_type, Count>( data() + (size() - Count), Count) ;
216
+ return { data() + (size() - Count), Count} ;
217
217
}
218
218
219
219
template<size_t Offset, size_t Count = dynamic_extent>
@@ -230,20 +230,20 @@ public:
230
230
constexpr span<element_type, dynamic_extent> first(index_type count) const
231
231
{
232
232
MBED_ASSERT(count <= size());
233
- return span<element_type>( data(), count) ;
233
+ return { data(), count} ;
234
234
}
235
235
236
236
constexpr span<element_type, dynamic_extent> last(index_type count) const
237
237
{
238
238
MBED_ASSERT(count <= size());
239
- return span<element_type>( data() + (size() - count), count) ;
239
+ return { data() + (size() - count), count} ;
240
240
}
241
241
242
242
constexpr span<element_type, dynamic_extent>
243
243
subspan(index_type offset, index_type count = dynamic_extent) const
244
244
{
245
245
MBED_ASSERT(offset <= size() && (count == dynamic_extent || count <= size() - offset ));
246
- return span<element_type, dynamic_extent>( data() + offset, count == dynamic_extent ? size() - offset : count ) ;
246
+ return { data() + offset, count == dynamic_extent ? size() - offset : count } ;
247
247
}
248
248
249
249
// Observers
@@ -329,37 +329,37 @@ as_writable_bytes(span<ElementType, Extent> s) noexcept
329
329
template<class ElementType, size_t Extent>
330
330
constexpr span<ElementType, Extent> make_span(ElementType (&arr)[Extent])
331
331
{
332
- return span<ElementType, Extent>( arr) ;
332
+ return arr;
333
333
}
334
334
335
335
template<class ElementType, size_t Extent>
336
336
constexpr span<const ElementType, Extent> make_span(const ElementType (&arr)[Extent])
337
337
{
338
- return span<const ElementType, Extent>( arr) ;
338
+ return arr;
339
339
}
340
340
341
341
template<class ElementType, size_t Extent>
342
342
constexpr span<ElementType, Extent> make_span(std::array<ElementType, Extent>& arr)
343
343
{
344
- return span<ElementType, Extent>( arr) ;
344
+ return arr;
345
345
}
346
346
347
347
template<class ElementType, size_t Extent>
348
348
constexpr span<const ElementType, Extent> make_span(const std::array<ElementType, Extent>& arr)
349
349
{
350
- return span<const ElementType, Extent>( arr) ;
350
+ return arr;
351
351
}
352
352
353
353
template<class R>
354
354
constexpr span<typename R::value_type> make_span(R& cont)
355
355
{
356
- return { cont} ;
356
+ return cont;
357
357
}
358
358
359
359
template<class R>
360
360
constexpr span<const typename R::value_type> make_span(const R& cont)
361
361
{
362
- return { cont} ;
362
+ return cont;
363
363
}
364
364
365
365
} // namespace mstd
0 commit comments