para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-25 01:01:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/jomaples/LWG3255

Browse Source
This commit is contained in:
Jordan Maples 2020-04-09 09:53:45 -07:00
commit f85166aa8b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gsl/multi_span
View File

@ -57,7 +57,7 @@
#endif // _MSC_VER < 1910 #endif // _MSC_VER < 1910
#endif // _MSC_VER #endif // _MSC_VER
#if __clang__ || __GNUC__ #if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
@ -2266,7 +2266,7 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif // __GNUC__ > 6 #endif // __GNUC__ > 6
#if __clang__ || __GNUC__ #if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

2
tests/multi_span_tests.cpp
View File

@ -1043,7 +1043,7 @@ TEST(multi_span_test, subspan)
EXPECT_TRUE(av.subspan(4).length() == 1); EXPECT_TRUE(av.subspan(4).length() == 1);
EXPECT_TRUE(av.subspan(5).length() == 0); EXPECT_TRUE(av.subspan(5).length() == 0);
// Disabled test instead of fixing since multi_span is deprecated. (PR#835) // Disabled test instead of fixing since multi_span is deprecated. (PR#835)
#if !(defined(__GNUC__) && __GNUC__ == 8 && __GNUC_MINOR__ == 3) #if !(defined(__GNUC__) && __GNUC__ == 8)
EXPECT_DEATH(av.subspan(6).length(), deathstring); EXPECT_DEATH(av.subspan(6).length(), deathstring);
#endif #endif
auto av2 = av.subspan(1); auto av2 = av.subspan(1);