Skip to content

Commit a527b95

Browse files
romanovvladbader
authored andcommitted
[SYCL][NFC][Test] Use std::is_same<>::value instead of std::is_same_v<> (#852)
std::is_same_v is not supported by the GCC 5.5 Signed-off-by: Vlad Romanov <[email protected]>
1 parent 6c512d3 commit a527b95

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

sycl/test/basic_tests/buffer/buffer_ctad.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ int main() {
1818
std::vector<int> v(5, 1);
1919
const std::vector<int> cv(5, 1);
2020
buffer b1(v.data(), range<1>(5));
21-
static_assert(std::is_same_v<decltype(b1), buffer<int, 1>>);
21+
static_assert(std::is_same<decltype(b1), buffer<int, 1>>::value);
2222
buffer b1a(v.data(), range<1>(5), std::allocator<int>());
2323
static_assert(
24-
std::is_same_v<decltype(b1a), buffer<int, 1, std::allocator<int>>>);
24+
std::is_same<decltype(b1a), buffer<int, 1, std::allocator<int>>>::value);
2525
buffer b1b(cv.data(), range<1>(5));
26-
static_assert(std::is_same_v<decltype(b1b), buffer<int, 1>>);
26+
static_assert(std::is_same<decltype(b1b), buffer<int, 1>>::value);
2727
buffer b1c(v.data(), range<2>(2, 2));
28-
static_assert(std::is_same_v<decltype(b1c), buffer<int, 2>>);
28+
static_assert(std::is_same<decltype(b1c), buffer<int, 2>>::value);
2929
buffer b2(v.begin(), v.end());
30-
static_assert(std::is_same_v<decltype(b2), buffer<int, 1>>);
30+
static_assert(std::is_same<decltype(b2), buffer<int, 1>>::value);
3131
buffer b2a(v.cbegin(), v.cend());
32-
static_assert(std::is_same_v<decltype(b2a), buffer<int, 1>>);
32+
static_assert(std::is_same<decltype(b2a), buffer<int, 1>>::value);
3333
buffer b3(v);
34-
static_assert(std::is_same_v<decltype(b3), buffer<int, 1>>);
34+
static_assert(std::is_same<decltype(b3), buffer<int, 1>>::value);
3535
buffer b3a(cv);
36-
static_assert(std::is_same_v<decltype(b3a), buffer<int, 1>>);
36+
static_assert(std::is_same<decltype(b3a), buffer<int, 1>>::value);
3737
shared_ptr_class<int> ptr{new int[5], [](int *p) { delete[] p; }};
3838
buffer b4(ptr, range<1>(5));
39-
static_assert(std::is_same_v<decltype(b4), buffer<int, 1>>);
39+
static_assert(std::is_same<decltype(b4), buffer<int, 1>>::value);
4040
}

sycl/test/basic_tests/id_ctad.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ int main() {
1414
cl::sycl::id one_dim_id(64);
1515
cl::sycl::id two_dim_id(64, 1);
1616
cl::sycl::id three_dim_id(64, 1, 2);
17-
static_assert(std::is_same_v<decltype(one_dim_id), cl::sycl::id<1>>);
18-
static_assert(std::is_same_v<decltype(two_dim_id), cl::sycl::id<2>>);
19-
static_assert(std::is_same_v<decltype(three_dim_id), cl::sycl::id<3>>);
17+
static_assert(std::is_same<decltype(one_dim_id), cl::sycl::id<1>>::value);
18+
static_assert(std::is_same<decltype(two_dim_id), cl::sycl::id<2>>::value);
19+
static_assert(std::is_same<decltype(three_dim_id), cl::sycl::id<3>>::value);
2020
}

sycl/test/basic_tests/range_ctad.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ int main() {
1414
cl::sycl::range one_dim_range(64);
1515
cl::sycl::range two_dim_range(64, 1);
1616
cl::sycl::range three_dim_range(64, 1, 2);
17-
static_assert(std::is_same_v<decltype(one_dim_range), cl::sycl::range<1>>);
18-
static_assert(std::is_same_v<decltype(two_dim_range), cl::sycl::range<2>>);
19-
static_assert(std::is_same_v<decltype(three_dim_range), cl::sycl::range<3>>);
17+
static_assert(
18+
std::is_same<decltype(one_dim_range), cl::sycl::range<1>>::value);
19+
static_assert(
20+
std::is_same<decltype(two_dim_range), cl::sycl::range<2>>::value);
21+
static_assert(
22+
std::is_same<decltype(three_dim_range), cl::sycl::range<3>>::value);
2023
cl::sycl::nd_range one_dim_ndrange(one_dim_range, one_dim_range);
2124
cl::sycl::nd_range two_dim_ndrange(two_dim_range, two_dim_range);
2225
cl::sycl::nd_range three_dim_ndrange(three_dim_range, three_dim_range);
2326
static_assert(
24-
std::is_same_v<decltype(one_dim_ndrange), cl::sycl::nd_range<1>>);
27+
std::is_same<decltype(one_dim_ndrange), cl::sycl::nd_range<1>>::value);
2528
static_assert(
26-
std::is_same_v<decltype(two_dim_ndrange), cl::sycl::nd_range<2>>);
29+
std::is_same<decltype(two_dim_ndrange), cl::sycl::nd_range<2>>::value);
2730
static_assert(
28-
std::is_same_v<decltype(three_dim_ndrange), cl::sycl::nd_range<3>>);
31+
std::is_same<decltype(three_dim_ndrange), cl::sycl::nd_range<3>>::value);
2932
}

sycl/test/basic_tests/vectors/ctad.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace sycl = cl::sycl;
1313

1414
int main() {
1515
sycl::vec v1(1);
16-
static_assert(std::is_same_v<decltype(v1), sycl::vec<int, 1>>);
16+
static_assert(std::is_same<decltype(v1), sycl::vec<int, 1>>::value);
1717
sycl::vec v2(1, 2);
18-
static_assert(std::is_same_v<decltype(v2), sycl::vec<int, 2>>);
18+
static_assert(std::is_same<decltype(v2), sycl::vec<int, 2>>::value);
1919
}

sycl/test/multi_ptr/ctad.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int main() {
2424
using globlMPtr = sycl::multi_ptr<int, address_space::global_space>;
2525
using constMPtr = sycl::multi_ptr<int, address_space::constant_space>;
2626
using localMPtr = sycl::multi_ptr<int, address_space::local_space>;
27-
static_assert(std::is_same_v<globlCTAD, globlMPtr>);
28-
static_assert(std::is_same_v<constCTAD, constMPtr>);
29-
static_assert(std::is_same_v<localCTAD, localMPtr>);
27+
static_assert(std::is_same<globlCTAD, globlMPtr>::value);
28+
static_assert(std::is_same<constCTAD, constMPtr>::value);
29+
static_assert(std::is_same<localCTAD, localMPtr>::value);
3030
}

0 commit comments

Comments
 (0)