Skip to content

Commit 07da1a7

Browse files
author
Marc Emmers
committed
Remove explicit constructors
1 parent 5231bec commit 07da1a7

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

platform/cxxsupport/mstd_span

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,15 @@ public:
205205
{
206206
static_assert(Count <= extent);
207207
MBED_ASSERT(Count <= size());
208-
return span<element_type, Count>(data(), Count);
208+
return {data(), Count};
209209
}
210210

211211
template<size_t Count>
212212
constexpr span<element_type, Count> last() const
213213
{
214214
static_assert(Count <= extent);
215215
MBED_ASSERT(Count <= size());
216-
return span<element_type, Count>(data() + (size() - Count), Count);
216+
return {data() + (size() - Count), Count};
217217
}
218218

219219
template<size_t Offset, size_t Count = dynamic_extent>
@@ -230,20 +230,20 @@ public:
230230
constexpr span<element_type, dynamic_extent> first(index_type count) const
231231
{
232232
MBED_ASSERT(count <= size());
233-
return span<element_type>(data(), count);
233+
return {data(), count};
234234
}
235235

236236
constexpr span<element_type, dynamic_extent> last(index_type count) const
237237
{
238238
MBED_ASSERT(count <= size());
239-
return span<element_type>(data() + (size() - count), count);
239+
return {data() + (size() - count), count};
240240
}
241241

242242
constexpr span<element_type, dynamic_extent>
243243
subspan(index_type offset, index_type count = dynamic_extent) const
244244
{
245245
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 };
247247
}
248248

249249
// Observers
@@ -329,37 +329,37 @@ as_writable_bytes(span<ElementType, Extent> s) noexcept
329329
template<class ElementType, size_t Extent>
330330
constexpr span<ElementType, Extent> make_span(ElementType (&arr)[Extent])
331331
{
332-
return span<ElementType, Extent>(arr);
332+
return arr;
333333
}
334334

335335
template<class ElementType, size_t Extent>
336336
constexpr span<const ElementType, Extent> make_span(const ElementType (&arr)[Extent])
337337
{
338-
return span<const ElementType, Extent>(arr);
338+
return arr;
339339
}
340340

341341
template<class ElementType, size_t Extent>
342342
constexpr span<ElementType, Extent> make_span(std::array<ElementType, Extent>& arr)
343343
{
344-
return span<ElementType, Extent>(arr);
344+
return arr;
345345
}
346346

347347
template<class ElementType, size_t Extent>
348348
constexpr span<const ElementType, Extent> make_span(const std::array<ElementType, Extent>& arr)
349349
{
350-
return span<const ElementType, Extent>(arr);
350+
return arr;
351351
}
352352

353353
template<class R>
354354
constexpr span<typename R::value_type> make_span(R& cont)
355355
{
356-
return {cont};
356+
return cont;
357357
}
358358

359359
template<class R>
360360
constexpr span<const typename R::value_type> make_span(const R& cont)
361361
{
362-
return {cont};
362+
return cont;
363363
}
364364

365365
} // namespace mstd

0 commit comments

Comments
 (0)