@@ -203,12 +203,6 @@ _CCCL_INLINE_VAR constexpr bool __is_std_span<span<_Tp, _Extent>> = true;
203
203
template <class _From , class _To >
204
204
_CCCL_CONCEPT __span_array_convertible = _CCCL_TRAIT(is_convertible, _From (*)[], _To (*)[]);
205
205
206
- template <class _Tp >
207
- _CCCL_INLINE_VAR constexpr bool __is_std_initializer_list = false ;
208
-
209
- template <class _Tp >
210
- _CCCL_INLINE_VAR constexpr bool __is_std_initializer_list<initializer_list<_Tp>> = true ;
211
-
212
206
# if !_CCCL_COMPILER(MSVC2017)
213
207
template <class _Range , class _ElementType >
214
208
_CCCL_CONCEPT_FRAGMENT (
@@ -235,22 +229,23 @@ _CCCL_INLINE_VAR constexpr bool __span_compatible_range<
235
229
_Range,
236
230
_ElementType,
237
231
void_t <
238
- // is a contiguous range
239
- enable_if_t <_CUDA_VRANGES::contiguous_range<_Range>, nullptr_t >,
240
- // is a sized range
241
- enable_if_t <_CUDA_VRANGES::sized_range<_Range>, nullptr_t >,
242
- // is a borrowed range or ElementType is const
243
- enable_if_t <(_CUDA_VRANGES::borrowed_range<_Range> || _CCCL_TRAIT(is_const, _ElementType)), nullptr_t>,
232
+ // // is a contiguous range
233
+ // enable_if_t<_CUDA_VRANGES::contiguous_range<_Range>, nullptr_t>,
234
+ // // is a sized range
235
+ // enable_if_t<_CUDA_VRANGES::sized_range<_Range>, nullptr_t>,
236
+ // // is a borrowed range or ElementType is const
237
+ // enable_if_t<(_CUDA_VRANGES::borrowed_range<_Range> || _CCCL_TRAIT(is_const, _ElementType)), nullptr_t>,
244
238
// is not a C-style array
245
239
enable_if_t <!_CCCL_TRAIT(is_array, remove_cvref_t <_Range>), nullptr_t>,
246
240
// is not a specialization of span
247
241
enable_if_t<!__is_std_span<remove_cvref_t<_Range>>, nullptr_t>,
248
242
// is not a specialization of array
249
243
enable_if_t<!__is_std_array<remove_cvref_t<_Range>>, nullptr_t>,
250
244
// remove_pointer_t<decltype(data(cont))>(*)[] is convertible to ElementType(*)[]
251
- enable_if_t<
252
- _CCCL_TRAIT(is_convertible, remove_reference_t <_CUDA_VRANGES::range_reference_t <_Range>> (*)[], _ElementType (*)[]),
253
- nullptr_t>>> = true;
245
+ enable_if_t<_CCCL_TRAIT(is_convertible,
246
+ remove_pointer_t <decltype(_CUDA_VSTD::data(declval<_Container&>()))> (*)[],
247
+ _ElementType (*)[]),
248
+ nullptr_t>>> = true;
254
249
# endif // _CCCL_COMPILER(MSVC2017)
255
250
256
251
# if _CCCL_STD_VER >= 2020
0 commit comments