para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2025-02-19 16:13:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

addressing travis errors

Browse Source
This commit is contained in:
Jordan Maples [MSFT] 2020-02-05 14:32:08 -08:00
parent 432be4852c
commit 7fcc142ffc
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/gsl/span
View File

@ -163,7 +163,7 @@ namespace details
constexpr span_iterator operator++(int) noexcept constexpr span_iterator operator++(int) noexcept
{ {
span_iterator ret = {*this}; auto ret{*this};
++*this; ++*this;
return ret; return ret;
} }
@ -178,7 +178,7 @@ namespace details
constexpr span_iterator operator--(int) noexcept constexpr span_iterator operator--(int) noexcept
{ {
span_iterator ret = {*this}; auto ret{*this};
--*this; --*this;
return ret; return ret;
} }
@ -194,7 +194,7 @@ namespace details
constexpr span_iterator operator+(const difference_type n) const noexcept constexpr span_iterator operator+(const difference_type n) const noexcept
{ {
span_iterator ret = {*this}; auto ret{*this};
return ret += n; return ret += n;
} }
@ -215,7 +215,7 @@ namespace details
constexpr span_iterator operator-(const difference_type n) const noexcept constexpr span_iterator operator-(const difference_type n) const noexcept
{ {
span_iterator ret = {*this}; auto ret{*this};
return ret -= n; return ret -= n;
} }

9
tests/span_tests.cpp
View File

@ -1102,8 +1102,13 @@ TEST(span_test, from_array_constructor)
{ {
span<int> s = a; span<int> s = a;
span<int> s2 = b; span<int> s2 = b;
EXPECT_DEATH(bool _ = (s.begin() == s2.begin()), deathstring); #if (__cplusplus > 201402L)
EXPECT_DEATH(bool _ = (s.begin() <= s2.begin()), deathstring); EXPECT_DEATH([[maybe_unused]] s.begin() == s2.begin(), deathstring);
EXPECT_DEATH([[maybe_unused]] s.begin() <= s2.begin(), deathstring);
#else
EXPECT_DEATH(s.begin() == s2.begin(), deathstring);
EXPECT_DEATH(s.begin() <= s2.begin(), deathstring);
#endif
} }
} }