From f2feab563f521c568afc5585146944c3b7b82076 Mon Sep 17 00:00:00 2001 From: Dmitry Kobets Date: Wed, 24 Nov 2021 16:41:47 -0800 Subject: [PATCH] Fix std::span 2020 compilation errors + test failures --- include/gsl/util | 8 +++---- tests/algorithm_tests.cpp | 5 ++--- tests/at_tests.cpp | 16 ++++++++----- tests/span_compatibility_tests.cpp | 6 ++--- tests/span_ext_tests.cpp | 36 +++++++++++++++--------------- tests/span_tests.cpp | 3 +-- tests/string_span_tests.cpp | 1 - 7 files changed, 39 insertions(+), 36 deletions(-) diff --git a/include/gsl/util b/include/gsl/util index 330b996..0907e11 100644 --- a/include/gsl/util +++ b/include/gsl/util @@ -124,7 +124,7 @@ template GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute // clang-format on - constexpr auto at(Cont& cont, const index i) -> decltype(cont[cont.size()]) + constexpr decltype(auto) at(Cont& cont, const index i) { Expects(i >= 0 && i < narrow_cast(cont.size())); using size_type = decltype(cont.size()); @@ -143,10 +143,10 @@ GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute #if defined(__cpp_lib_span) && __cpp_lib_span >= 202002L template -constexpr auto at(std::span sp, const index i) +constexpr decltype(auto) at(std::span sp, const index i) { - Expects(i >= 0 && i < narrow_cast(sp.size())); - return sp[i]; + Expects(i >= 0 && i < narrow_cast(sp.size())); + return sp[gsl::narrow_cast(i)]; } #endif // __cpp_lib_span >= 202002L } // namespace gsl diff --git a/tests/algorithm_tests.cpp b/tests/algorithm_tests.cpp index 16746b4..e369be0 100644 --- a/tests/algorithm_tests.cpp +++ b/tests/algorithm_tests.cpp @@ -27,7 +27,6 @@ namespace gsl struct fail_fast; } // namespace gsl -using namespace std; using namespace gsl; TEST(algorithm_tests, same_type) @@ -73,8 +72,8 @@ TEST(algorithm_tests, same_type) std::array src{1, 2, 3, 4, 5}; std::array dst{}; - const span src_span(src); - const span dst_span(dst); + const gsl::span src_span(src); + const gsl::span dst_span(dst); copy(src_span, dst_span); copy(src_span, dst_span.subspan(src_span.size())); diff --git a/tests/at_tests.cpp b/tests/at_tests.cpp index 92a8e4d..381ab61 100644 --- a/tests/at_tests.cpp +++ b/tests/at_tests.cpp @@ -128,16 +128,22 @@ TEST(at_tests, std_span) std::vector cvec{1, 2, 3, 4, 5}; std::span csp{cvec}; - for (size_t i = 0, i < vec.size(); ++i) + for (gsl::index i = 0; i < gsl::narrow_cast(vec.size()); ++i) { - EXPECT_TRUE(&gsl::at(sp, i) == &vec[i]); - EXPECT_TRUE(&gsl::at(csp, i) == &cvec[i]); + EXPECT_TRUE(&gsl::at(sp, i) == &vec[gsl::narrow_cast(i)]); + EXPECT_TRUE(&gsl::at(csp, i) == &cvec[gsl::narrow_cast(i)]); } + const auto terminateHandler = std::set_terminate([] { + std::cerr << "Expected Death. std_span"; + std::abort(); + }); + const auto expected = GetExpectedDeathString(terminateHandler); + EXPECT_DEATH(gsl::at(sp, -1), expected); - EXPECT_DEATH(gsl::at(sp, sp.size()), expected); + EXPECT_DEATH(gsl::at(sp, gsl::narrow_cast(sp.size())), expected); EXPECT_DEATH(gsl::at(csp, -1), expected); - EXPECT_DEATH(gsl::at(csp, sp.size()), expected); + EXPECT_DEATH(gsl::at(csp, gsl::narrow_cast(sp.size())), expected); } #endif // __cplusplus >= 202002L diff --git a/tests/span_compatibility_tests.cpp b/tests/span_compatibility_tests.cpp index 56bd385..95d8223 100644 --- a/tests/span_compatibility_tests.cpp +++ b/tests/span_compatibility_tests.cpp @@ -55,14 +55,14 @@ void ArrayConvertibilityCheck() EXPECT_TRUE(sp_const_nullptr_1.data() == stl_nullptr.data()); EXPECT_TRUE(sp_const_nullptr_1.size() == 3); - span sp_const_nullptr_2{std::as_const(stl_nullptr)}; + gsl::span sp_const_nullptr_2{std::as_const(stl_nullptr)}; EXPECT_TRUE(sp_const_nullptr_2.data() == stl_nullptr.data()); EXPECT_TRUE(sp_const_nullptr_2.size() == 3); - static_assert(std::is_same>::value, + static_assert(std::is_same>::value, "std::is_same< decltype(span{stl_nullptr}), span>::value"); static_assert( - std::is_same>::value, + std::is_same>::value, "std::is_same< decltype(span{std::as_const(stl_nullptr)}), span>::value"); } diff --git a/tests/span_ext_tests.cpp b/tests/span_ext_tests.cpp index 7ce4e51..3d35f8f 100644 --- a/tests/span_ext_tests.cpp +++ b/tests/span_ext_tests.cpp @@ -48,7 +48,7 @@ TEST(span_ext_test, make_span_from_pointer_length_constructor) { int* p = nullptr; - auto s = make_span(p, narrow_cast::size_type>(0)); + auto s = make_span(p, narrow_cast::size_type>(0)); EXPECT_TRUE(s.size() == 0); EXPECT_TRUE(s.data() == nullptr); } @@ -136,9 +136,9 @@ TEST(span_ext_test, make_span_from_std_array_constructor) // This test checks for the bug found in gcc 6.1, 6.2, 6.3, 6.4, 6.5 7.1, 7.2, 7.3 - issue #590 { - span s1 = make_span(arr); + gsl::span s1 = make_span(arr); - static span s2; + static gsl::span s2; s2 = s1; #if defined(__GNUC__) && __GNUC__ == 6 && (__GNUC_MINOR__ == 4 || __GNUC_MINOR__ == 5) && \ @@ -194,7 +194,7 @@ TEST(span_ext_test, make_span_from_container_constructor) TEST(span_test, interop_with_gsl_at) { int arr[5] = {1, 2, 3, 4, 5}; - span s{arr}; + gsl::span s{arr}; EXPECT_TRUE(at(s, 0) == 1); EXPECT_TRUE(at(s, 1) == 2); } @@ -202,7 +202,7 @@ TEST(span_test, interop_with_gsl_at) TEST(span_ext_test, iterator_free_functions) { int a[] = {1, 2, 3, 4}; - span s{a}; + gsl::span s{a}; EXPECT_TRUE((std::is_same::value)); EXPECT_TRUE((std::is_same::value)); @@ -232,7 +232,7 @@ TEST(span_ext_test, iterator_free_functions) TEST(span_ext_test, ssize_free_function) { int a[] = {1, 2, 3, 4}; - span s{a}; + gsl::span s{a}; EXPECT_FALSE((std::is_same::value)); EXPECT_TRUE(s.size() == static_cast(ssize(s))); @@ -242,8 +242,8 @@ TEST(span_ext_test, ssize_free_function) TEST(span_ext_test, comparison_operators) { { - span s1; - span s2; + gsl::span s1; + gsl::span s2; EXPECT_TRUE(s1 == s2); EXPECT_FALSE(s1 != s2); EXPECT_FALSE(s1 < s2); @@ -260,8 +260,8 @@ TEST(span_ext_test, comparison_operators) { int arr[] = {2, 1}; - span s1 = arr; - span s2 = arr; + gsl::span s1 = arr; + gsl::span s2 = arr; EXPECT_TRUE(s1 == s2); EXPECT_FALSE(s1 != s2); @@ -280,8 +280,8 @@ TEST(span_ext_test, comparison_operators) { int arr[] = {2, 1}; // bigger - span s1; - span s2 = arr; + gsl::span s1; + gsl::span s2 = arr; EXPECT_TRUE(s1 != s2); EXPECT_TRUE(s2 != s1); @@ -300,8 +300,8 @@ TEST(span_ext_test, comparison_operators) { int arr1[] = {1, 2}; int arr2[] = {1, 2}; - span s1 = arr1; - span s2 = arr2; + gsl::span s1 = arr1; + gsl::span s2 = arr2; EXPECT_TRUE(s1 == s2); EXPECT_FALSE(s1 != s2); @@ -320,8 +320,8 @@ TEST(span_ext_test, comparison_operators) { int arr[] = {1, 2, 3}; - span s1 = {&arr[0], 2}; // shorter - span s2 = arr; // longer + gsl::span s1 = {&arr[0], 2}; // shorter + gsl::span s2 = arr; // longer EXPECT_TRUE(s1 != s2); EXPECT_TRUE(s2 != s1); @@ -341,8 +341,8 @@ TEST(span_ext_test, comparison_operators) int arr1[] = {1, 2}; // smaller int arr2[] = {2, 1}; // bigger - span s1 = arr1; - span s2 = arr2; + gsl::span s1 = arr1; + gsl::span s2 = arr2; EXPECT_TRUE(s1 != s2); EXPECT_TRUE(s2 != s1); diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp index 1e0222e..33ccf56 100644 --- a/tests/span_tests.cpp +++ b/tests/span_tests.cpp @@ -43,7 +43,6 @@ #include "deathTestCommon.h" -using namespace std; using namespace gsl; namespace @@ -1085,7 +1084,7 @@ TEST(span_test, as_bytes) int b[5] = {1, 2, 3, 4, 5}; { - span sp(begin(b), static_cast(-2)); + span sp(std::begin(b), static_cast(-2)); EXPECT_DEATH((void) sp.size_bytes(), expected); } } diff --git a/tests/string_span_tests.cpp b/tests/string_span_tests.cpp index ed42b38..45a67d9 100644 --- a/tests/string_span_tests.cpp +++ b/tests/string_span_tests.cpp @@ -30,7 +30,6 @@ #include "deathTestCommon.h" -using namespace std; using namespace gsl; // Generic string functions