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

Fix std::span 2020 compilation errors + test failures

Browse Source
This commit is contained in:
Dmitry Kobets 2021-11-24 16:41:47 -08:00
parent e0880931ae
commit f2feab563f
7 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/gsl/util
View File

@ -124,7 +124,7 @@ template <class Cont>
GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute
// clang-format on // 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<index>(cont.size())); Expects(i >= 0 && i < narrow_cast<index>(cont.size()));
using size_type = decltype(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 #if defined(__cpp_lib_span) && __cpp_lib_span >= 202002L
template <class T, size_t extent = std::dynamic_extent> template <class T, size_t extent = std::dynamic_extent>
constexpr auto at(std::span<T, extent> sp, const index i) constexpr decltype(auto) at(std::span<T, extent> sp, const index i)
{ {
Expects(i >= 0 && i < narrow_cast<i>(sp.size())); Expects(i >= 0 && i < narrow_cast<index>(sp.size()));
return sp[i]; return sp[gsl::narrow_cast<size_t>(i)];
} }
#endif // __cpp_lib_span >= 202002L #endif // __cpp_lib_span >= 202002L
} // namespace gsl } // namespace gsl

5
tests/algorithm_tests.cpp
View File

@ -27,7 +27,6 @@ namespace gsl
struct fail_fast; struct fail_fast;
} // namespace gsl } // namespace gsl
using namespace std;
using namespace gsl; using namespace gsl;
TEST(algorithm_tests, same_type) TEST(algorithm_tests, same_type)
@ -73,8 +72,8 @@ TEST(algorithm_tests, same_type)
std::array<int, 5> src{1, 2, 3, 4, 5}; std::array<int, 5> src{1, 2, 3, 4, 5};
std::array<int, 10> dst{}; std::array<int, 10> dst{};
const span<int> src_span(src); const gsl::span<int> src_span(src);
const span<int, 10> dst_span(dst); const gsl::span<int, 10> dst_span(dst);
copy(src_span, dst_span); copy(src_span, dst_span);
copy(src_span, dst_span.subspan(src_span.size())); copy(src_span, dst_span.subspan(src_span.size()));

16
tests/at_tests.cpp
View File

@ -128,16 +128,22 @@ TEST(at_tests, std_span)
std::vector<int> cvec{1, 2, 3, 4, 5}; std::vector<int> cvec{1, 2, 3, 4, 5};
std::span csp{cvec}; std::span csp{cvec};
for (size_t i = 0, i < vec.size(); ++i) for (gsl::index i = 0; i < gsl::narrow_cast<gsl::index>(vec.size()); ++i)
{ {
EXPECT_TRUE(&gsl::at(sp, i) == &vec[i]); EXPECT_TRUE(&gsl::at(sp, i) == &vec[gsl::narrow_cast<size_t>(i)]);
EXPECT_TRUE(&gsl::at(csp, i) == &cvec[i]); EXPECT_TRUE(&gsl::at(csp, i) == &cvec[gsl::narrow_cast<size_t>(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, -1), expected);
EXPECT_DEATH(gsl::at(sp, sp.size()), expected); EXPECT_DEATH(gsl::at(sp, gsl::narrow_cast<gsl::index>(sp.size())), expected);
EXPECT_DEATH(gsl::at(csp, -1), expected); EXPECT_DEATH(gsl::at(csp, -1), expected);
EXPECT_DEATH(gsl::at(csp, sp.size()), expected); EXPECT_DEATH(gsl::at(csp, gsl::narrow_cast<gsl::index>(sp.size())), expected);
} }
#endif // __cplusplus >= 202002L #endif // __cplusplus >= 202002L

6
tests/span_compatibility_tests.cpp
View File

@ -55,14 +55,14 @@ void ArrayConvertibilityCheck()
EXPECT_TRUE(sp_const_nullptr_1.data() == stl_nullptr.data()); EXPECT_TRUE(sp_const_nullptr_1.data() == stl_nullptr.data());
EXPECT_TRUE(sp_const_nullptr_1.size() == 3); EXPECT_TRUE(sp_const_nullptr_1.size() == 3);
span<const T* const> sp_const_nullptr_2{std::as_const(stl_nullptr)}; gsl::span<const T* const> 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.data() == stl_nullptr.data());
EXPECT_TRUE(sp_const_nullptr_2.size() == 3); EXPECT_TRUE(sp_const_nullptr_2.size() == 3);
static_assert(std::is_same<decltype(span{stl_nullptr}), span<T*, 3>>::value, static_assert(std::is_same<decltype(gsl::span{stl_nullptr}), gsl::span<T*, 3>>::value,
"std::is_same< decltype(span{stl_nullptr}), span<T*, 3>>::value"); "std::is_same< decltype(span{stl_nullptr}), span<T*, 3>>::value");
static_assert( static_assert(
std::is_same<decltype(span{std::as_const(stl_nullptr)}), span<T* const, 3>>::value, std::is_same<decltype(gsl::span{std::as_const(stl_nullptr)}), gsl::span<T* const, 3>>::value,
"std::is_same< decltype(span{std::as_const(stl_nullptr)}), span<T* const, " "std::is_same< decltype(span{std::as_const(stl_nullptr)}), span<T* const, "
"3>>::value"); "3>>::value");
} }

36
tests/span_ext_tests.cpp
View File

@ -48,7 +48,7 @@ TEST(span_ext_test, make_span_from_pointer_length_constructor)
{ {
int* p = nullptr; int* p = nullptr;
auto s = make_span(p, narrow_cast<span<int>::size_type>(0)); auto s = make_span(p, narrow_cast<gsl::span<int>::size_type>(0));
EXPECT_TRUE(s.size() == 0); EXPECT_TRUE(s.size() == 0);
EXPECT_TRUE(s.data() == nullptr); 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 // 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<int> s1 = make_span(arr); gsl::span<int> s1 = make_span(arr);
static span<int> s2; static gsl::span<int> s2;
s2 = s1; s2 = s1;
#if defined(__GNUC__) && __GNUC__ == 6 && (__GNUC_MINOR__ == 4 || __GNUC_MINOR__ == 5) && \ #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) TEST(span_test, interop_with_gsl_at)
{ {
int arr[5] = {1, 2, 3, 4, 5}; int arr[5] = {1, 2, 3, 4, 5};
span<int> s{arr}; gsl::span<int> s{arr};
EXPECT_TRUE(at(s, 0) == 1); EXPECT_TRUE(at(s, 0) == 1);
EXPECT_TRUE(at(s, 1) == 2); EXPECT_TRUE(at(s, 1) == 2);
} }
@ -202,7 +202,7 @@ TEST(span_test, interop_with_gsl_at)
TEST(span_ext_test, iterator_free_functions) TEST(span_ext_test, iterator_free_functions)
{ {
int a[] = {1, 2, 3, 4}; int a[] = {1, 2, 3, 4};
span<int> s{a}; gsl::span<int> s{a};
EXPECT_TRUE((std::is_same<decltype(s.begin()), decltype(begin(s))>::value)); EXPECT_TRUE((std::is_same<decltype(s.begin()), decltype(begin(s))>::value));
EXPECT_TRUE((std::is_same<decltype(s.end()), decltype(end(s))>::value)); EXPECT_TRUE((std::is_same<decltype(s.end()), decltype(end(s))>::value));
@ -232,7 +232,7 @@ TEST(span_ext_test, iterator_free_functions)
TEST(span_ext_test, ssize_free_function) TEST(span_ext_test, ssize_free_function)
{ {
int a[] = {1, 2, 3, 4}; int a[] = {1, 2, 3, 4};
span<int> s{a}; gsl::span<int> s{a};
EXPECT_FALSE((std::is_same<decltype(s.size()), decltype(ssize(s))>::value)); EXPECT_FALSE((std::is_same<decltype(s.size()), decltype(ssize(s))>::value));
EXPECT_TRUE(s.size() == static_cast<std::size_t>(ssize(s))); EXPECT_TRUE(s.size() == static_cast<std::size_t>(ssize(s)));
@ -242,8 +242,8 @@ TEST(span_ext_test, ssize_free_function)
TEST(span_ext_test, comparison_operators) TEST(span_ext_test, comparison_operators)
{ {
{ {
span<int> s1; gsl::span<int> s1;
span<int> s2; gsl::span<int> s2;
EXPECT_TRUE(s1 == s2); EXPECT_TRUE(s1 == s2);
EXPECT_FALSE(s1 != s2); EXPECT_FALSE(s1 != s2);
EXPECT_FALSE(s1 < s2); EXPECT_FALSE(s1 < s2);
@ -260,8 +260,8 @@ TEST(span_ext_test, comparison_operators)
{ {
int arr[] = {2, 1}; int arr[] = {2, 1};
span<int> s1 = arr; gsl::span<int> s1 = arr;
span<int> s2 = arr; gsl::span<int> s2 = arr;
EXPECT_TRUE(s1 == s2); EXPECT_TRUE(s1 == s2);
EXPECT_FALSE(s1 != s2); EXPECT_FALSE(s1 != s2);
@ -280,8 +280,8 @@ TEST(span_ext_test, comparison_operators)
{ {
int arr[] = {2, 1}; // bigger int arr[] = {2, 1}; // bigger
span<int> s1; gsl::span<int> s1;
span<int> s2 = arr; gsl::span<int> s2 = arr;
EXPECT_TRUE(s1 != s2); EXPECT_TRUE(s1 != s2);
EXPECT_TRUE(s2 != s1); EXPECT_TRUE(s2 != s1);
@ -300,8 +300,8 @@ TEST(span_ext_test, comparison_operators)
{ {
int arr1[] = {1, 2}; int arr1[] = {1, 2};
int arr2[] = {1, 2}; int arr2[] = {1, 2};
span<int> s1 = arr1; gsl::span<int> s1 = arr1;
span<int> s2 = arr2; gsl::span<int> s2 = arr2;
EXPECT_TRUE(s1 == s2); EXPECT_TRUE(s1 == s2);
EXPECT_FALSE(s1 != s2); EXPECT_FALSE(s1 != s2);
@ -320,8 +320,8 @@ TEST(span_ext_test, comparison_operators)
{ {
int arr[] = {1, 2, 3}; int arr[] = {1, 2, 3};
span<int> s1 = {&arr[0], 2}; // shorter gsl::span<int> s1 = {&arr[0], 2}; // shorter
span<int> s2 = arr; // longer gsl::span<int> s2 = arr; // longer
EXPECT_TRUE(s1 != s2); EXPECT_TRUE(s1 != s2);
EXPECT_TRUE(s2 != s1); EXPECT_TRUE(s2 != s1);
@ -341,8 +341,8 @@ TEST(span_ext_test, comparison_operators)
int arr1[] = {1, 2}; // smaller int arr1[] = {1, 2}; // smaller
int arr2[] = {2, 1}; // bigger int arr2[] = {2, 1}; // bigger
span<int> s1 = arr1; gsl::span<int> s1 = arr1;
span<int> s2 = arr2; gsl::span<int> s2 = arr2;
EXPECT_TRUE(s1 != s2); EXPECT_TRUE(s1 != s2);
EXPECT_TRUE(s2 != s1); EXPECT_TRUE(s2 != s1);

3
tests/span_tests.cpp
View File

@ -43,7 +43,6 @@
#include "deathTestCommon.h" #include "deathTestCommon.h"
using namespace std;
using namespace gsl; using namespace gsl;
namespace namespace
@ -1085,7 +1084,7 @@ TEST(span_test, as_bytes)
int b[5] = {1, 2, 3, 4, 5}; int b[5] = {1, 2, 3, 4, 5};
{ {
span<int> sp(begin(b), static_cast<size_t>(-2)); span<int> sp(std::begin(b), static_cast<size_t>(-2));
EXPECT_DEATH((void) sp.size_bytes(), expected); EXPECT_DEATH((void) sp.size_bytes(), expected);
} }
} }

1
tests/string_span_tests.cpp
View File

@ -30,7 +30,6 @@
#include "deathTestCommon.h" #include "deathTestCommon.h"
using namespace std;
using namespace gsl; using namespace gsl;
// Generic string functions // Generic string functions