diff options
| author | Jordan Maples <jomaples@microsoft.com> | 2020-05-20 23:37:42 +0300 |
|---|---|---|
| committer | Jordan Maples <jomaples@microsoft.com> | 2020-05-20 23:37:42 +0300 |
| commit | 1e444816463196b1dbf6eeb8b6cb7c797d4c9c11 (patch) | |
| tree | 46484e15f8389dd1dd34094233f3d0c55cae564c | |
| parent | ed3fea6d9317305e27ff3022424791d78369a6ff (diff) | |
Finished integrating CaseyCarter's changes into span
| -rw-r--r-- | include/gsl/span | 6 | ||||
| -rw-r--r-- | tests/span_tests.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/gsl/span b/include/gsl/span index 1cb9e84..fcc74aa 100644 --- a/include/gsl/span +++ b/include/gsl/span @@ -519,7 +519,7 @@ public: template < class OtherElementType, std::size_t OtherExtent, std::size_t SpanExtent = Extent, 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> constexpr span(const span<OtherElementType, OtherExtent>& other) noexcept : storage_(other.data(), details::extent_type<OtherExtent>(other.size())) @@ -542,7 +542,7 @@ public: constexpr span<element_type, Count> first() const noexcept { Expects(Count <= size()); - return span<element_type, Count>(data(), Count); + return span<element_type, Count>{data(), Count}; } template <std::size_t Count> @@ -552,7 +552,7 @@ public: constexpr span<element_type, Count> last() const noexcept { 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> diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp index ae4503e..44198a6 100644 --- a/tests/span_tests.cpp +++ b/tests/span_tests.cpp @@ -1144,7 +1144,7 @@ TEST(span_test, from_array_constructor) // you can convert statically { - const span<int, 2> s2(&arr[0], 2); + const span<int, 2> s2{&arr[0], 2}; static_cast<void>(s2); } { @@ -1180,7 +1180,7 @@ TEST(span_test, from_array_constructor) #endif { auto f = [&]() { - const span<int, 4> _s4(arr2, 2); + span<int, 4> _s4{arr2, 2}; static_cast<void>(_s4); }; EXPECT_DEATH(f(), deathstring); |