para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2025-01-18 17:55:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finished integrating CaseyCarter's changes into span

Browse Source
This commit is contained in:
Jordan Maples 2020-05-20 13:37:42 -07:00
parent ed3fea6d93
commit 1e44481646
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gsl/span
View File

@ -519,7 +519,7 @@ public:
template < template <
class OtherElementType, std::size_t OtherExtent, std::size_t SpanExtent = Extent, class OtherElementType, std::size_t OtherExtent, std::size_t SpanExtent = Extent,
std::enable_if_t< std::enable_if_t<
(SpanExtent == dynamic_extent || OtherExtent == dynamic_extent) && (SpanExtent == dynamic_extent || SpanExtent == OtherExtent) &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value, int> = 0> details::is_allowed_element_type_conversion<OtherElementType, element_type>::value, int> = 0>
constexpr span(const span<OtherElementType, OtherExtent>& other) noexcept constexpr span(const span<OtherElementType, OtherExtent>& other) noexcept
: storage_(other.data(), details::extent_type<OtherExtent>(other.size())) : storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
@ -542,7 +542,7 @@ public:
constexpr span<element_type, Count> first() const noexcept constexpr span<element_type, Count> first() const noexcept
{ {
Expects(Count <= size()); Expects(Count <= size());
return span<element_type, Count>(data(), Count); return span<element_type, Count>{data(), Count};
} }
template <std::size_t Count> template <std::size_t Count>
@ -552,7 +552,7 @@ public:
constexpr span<element_type, Count> last() const noexcept constexpr span<element_type, Count> last() const noexcept
{ {
Expects(Count <= size()); Expects(Count <= size());
return span<element_type, Count>(data() + (size() - Count), Count); return span<element_type, Count>{data() + (size() - Count), Count};
} }
template <std::size_t Offset, std::size_t Count = dynamic_extent> template <std::size_t Offset, std::size_t Count = dynamic_extent>

4
tests/span_tests.cpp
View File

@ -1144,7 +1144,7 @@ TEST(span_test, from_array_constructor)
// you can convert statically // you can convert statically
{ {
const span<int, 2> s2(&arr[0], 2); const span<int, 2> s2{&arr[0], 2};
static_cast<void>(s2); static_cast<void>(s2);
} }
{ {
@ -1180,7 +1180,7 @@ TEST(span_test, from_array_constructor)
#endif #endif
{ {
auto f = [&]() { auto f = [&]() {
const span<int, 4> _s4(arr2, 2); span<int, 4> _s4{arr2, 2};
static_cast<void>(_s4); static_cast<void>(_s4);
}; };
EXPECT_DEATH(f(), deathstring); EXPECT_DEATH(f(), deathstring);