Skip to content

Commit 7a1c1df

Browse files
Copilotcrtrott
andcommitted
Remove MDSPAN_IMPL_ENABLE_P3663 guards and operator() block from test_strided_slice
Co-authored-by: crtrott <9490481+crtrott@users.noreply.github.com>
1 parent 0489fe2 commit 7a1c1df

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

tests/test_strided_slice.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ void test_strided_slice(OffsetType offset, ExtentType extent, StrideType stride)
4242
template<class T, T Value>
4343
constexpr auto IC = std::integral_constant<T, Value>{};
4444

45-
#if defined(MDSPAN_IMPL_ENABLE_P3663)
4645
MDSPAN_TEMPLATE_REQUIRES(
4746
class T,
4847
T Value,
@@ -53,11 +52,6 @@ MDSPAN_TEMPLATE_REQUIRES(
5352
struct my_integral_constant {
5453
static constexpr T value = Value;
5554
constexpr operator T () const { return value; }
56-
// icpx insists that, even with the macro protection,
57-
// "declaring overloaded 'operator()' as 'static' is a C++2b extension."
58-
#if (__cplusplus >= 202302L) && defined(__cpp_static_call_operator)
59-
static constexpr T operator() () { return value; }
60-
#endif
6155
};
6256

6357
template<class T, T Value>
@@ -77,7 +71,6 @@ static_assert(
7771
Kokkos::detail::is_integral_constant_like_v<
7872
my_integral_constant<int, 1>
7973
>);
80-
#endif // MDSPAN_IMPL_ENABLE_P3663
8174

8275
TEST(StridedSlice, WellFormed) {
8376
test_strided_slice(int(1), unsigned(10), long(3));
@@ -87,7 +80,6 @@ TEST(StridedSlice, WellFormed) {
8780
test_strided_slice(int(1), IC<unsigned, 10>, long(3));
8881
test_strided_slice(int(1), unsigned(10), IC<long, 3>);
8982

90-
#if defined(MDSPAN_IMPL_ENABLE_P3663)
9183
using MDSPAN_IMPL_STANDARD_NAMESPACE::detail::cw;
9284

9385
test_strided_slice(cw<1>, unsigned(10), long(3));
@@ -97,7 +89,6 @@ TEST(StridedSlice, WellFormed) {
9789
test_strided_slice(IC2<int, 1>, unsigned(10), long(3));
9890
test_strided_slice(int(1), IC2<unsigned, 10>, long(3));
9991
test_strided_slice(int(1), unsigned(10), IC2<long, 3>);
100-
#endif
10192
}
10293

10394
} // namespace (anonymous)

0 commit comments

Comments
 (0)