para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2025-05-12 17:05:20 -04:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

reverting changes to gsl::index

Browse Source
This commit is contained in:
Jordan Maples [MSFT]
2020-02-05 17:02:23 -08:00
parent 45f016d96f
commit 3b9d15f49f
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/at_tests.cpp
View File

@ -33,7 +33,7 @@ TEST(at_tests, static_array)
int a[4] = {1, 2, 3, 4};
const int(&c_a)[4] = a;
for (std::size_t i = 0; i < 4; ++i) {
for (int i = 0; i < 4; ++i) {
EXPECT_TRUE(&gsl::at(a, i) == &a[i]);
EXPECT_TRUE(&gsl::at(c_a, i) == &a[i]);
}
@ -43,7 +43,9 @@ TEST(at_tests, static_array)
std::abort();
});
EXPECT_DEATH(gsl::at(a, -1), deathstring);
EXPECT_DEATH(gsl::at(a, 4), deathstring);
EXPECT_DEATH(gsl::at(c_a, -1), deathstring);
EXPECT_DEATH(gsl::at(c_a, 4), deathstring);
}
@ -52,7 +54,7 @@ TEST(at_tests, std_array)
std::array<int, 4> a = {1, 2, 3, 4};
const std::array<int, 4>& c_a = a;
for (std::size_t i = 0; i < 4; ++i) {
for (int i = 0; i < 4; ++i) {
EXPECT_TRUE(&gsl::at(a, i) == &a[static_cast<std::size_t>(i)]);
EXPECT_TRUE(&gsl::at(c_a, i) == &a[static_cast<std::size_t>(i)]);
}
@ -62,7 +64,9 @@ TEST(at_tests, std_array)
std::abort();
});
EXPECT_DEATH(gsl::at(a, -1), deathstring);
EXPECT_DEATH(gsl::at(a, 4), deathstring);
EXPECT_DEATH(gsl::at(c_a, -1), deathstring);
EXPECT_DEATH(gsl::at(c_a, 4), deathstring);
}
@ -71,7 +75,7 @@ TEST(at_tests, std_vector)
std::vector<int> a = {1, 2, 3, 4};
const std::vector<int>& c_a = a;
for (std::size_t i = 0; i < 4; ++i) {
for (int i = 0; i < 4; ++i) {
EXPECT_TRUE(&gsl::at(a, i) == &a[static_cast<std::size_t>(i)]);
EXPECT_TRUE(&gsl::at(c_a, i) == &a[static_cast<std::size_t>(i)]);
}
@ -81,7 +85,9 @@ TEST(at_tests, std_vector)
std::abort();
});
EXPECT_DEATH(gsl::at(a, -1), deathstring);
EXPECT_DEATH(gsl::at(a, 4), deathstring);
EXPECT_DEATH(gsl::at(c_a, -1), deathstring);
EXPECT_DEATH(gsl::at(c_a, 4), deathstring);
}
@ -90,8 +96,8 @@ TEST(at_tests, InitializerList)
const std::initializer_list<int> a = {1, 2, 3, 4};
for (int i = 0; i < 4; ++i) {
EXPECT_TRUE(gsl::at(a, static_cast<std::size_t>(i)) == i + 1);
EXPECT_TRUE(gsl::at({1, 2, 3, 4}, static_cast<std::size_t>(i)) == i + 1);
EXPECT_TRUE(gsl::at(a, i) == i + 1);
EXPECT_TRUE(gsl::at({1, 2, 3, 4}, i) == i + 1);
}
std::set_terminate([] {
@ -99,7 +105,9 @@ TEST(at_tests, InitializerList)
std::abort();
});
EXPECT_DEATH(gsl::at(a, -1), deathstring);
EXPECT_DEATH(gsl::at(a, 4), deathstring);
EXPECT_DEATH(gsl::at({1, 2, 3, 4}, -1), deathstring);
EXPECT_DEATH(gsl::at({1, 2, 3, 4}, 4), deathstring);
}
@ -112,12 +120,12 @@ static constexpr bool test_constexpr()
const std::array<int, 4>& c_a2 = a2;
for (int i = 0; i < 4; ++i) {
if (&gsl::at(a1, static_cast<std::size_t>(i)) != &a1[i]) return false;
if (&gsl::at(c_a1, static_cast<std::size_t>(i)) != &a1[i]) return false;
if (&gsl::at(a1, i) != &a1[i]) return false;
if (&gsl::at(c_a1, i) != &a1[i]) return false;
// requires C++17:
// if (&gsl::at(a2, i) != &a2[static_cast<std::size_t>(i)]) return false;
if (&gsl::at(c_a2, static_cast<std::size_t>(i)) != &c_a2[static_cast<std::size_t>(i)]) return false;
if (gsl::at({1, 2, 3, 4}, static_cast<std::size_t>(i)) != i + 1) return false;
if (&gsl::at(c_a2, i) != &c_a2[static_cast<std::size_t>(i)]) return false;
if (gsl::at({1, 2, 3, 4}, i) != i + 1) return false;
}
return true;

2
tests/utils_tests.cpp
View File

@ -38,7 +38,7 @@ void g() { j += 1; }
TEST(utils_tests, sanity_check_for_gsl_index_typedef)
{
static_assert(std::is_same<gsl::index, std::size_t>::value,
static_assert(std::is_same<gsl::index, std::ptrdiff_t>::value,
"gsl::index represents wrong arithmetic type");
}