@@ -229,15 +229,15 @@ destroy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __
229
229
const auto __is_parallel =
230
230
oneapi::dpl::__internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
231
231
using _is_vector_type =
232
- #if _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN
232
+ #if (_PSTL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN || _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN)
233
233
::std::conditional_t <
234
234
oneapi::dpl::__internal::__is_host_execution_policy<::std::decay_t <_ExecutionPolicy>>::value,
235
235
::std::false_type,
236
236
decltype (oneapi::dpl::__internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(
237
237
__exec))>;
238
238
#else
239
239
decltype (oneapi::dpl::__internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec));
240
- #endif // _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN
240
+ #endif // _PSTL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN || _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN
241
241
constexpr _is_vector_type __is_vector;
242
242
243
243
if constexpr (!::std::is_trivially_destructible_v<_ValueType>)
@@ -258,15 +258,15 @@ destroy_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n)
258
258
const auto __is_parallel =
259
259
oneapi::dpl::__internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
260
260
using _is_vector_type =
261
- #if _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN
261
+ #if (_PSTL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN || _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN)
262
262
::std::conditional_t <
263
263
oneapi::dpl::__internal::__is_host_execution_policy<::std::decay_t <_ExecutionPolicy>>::value,
264
264
::std::false_type,
265
265
decltype (oneapi::dpl::__internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(
266
266
__exec))>;
267
267
#else
268
268
decltype (oneapi::dpl::__internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec));
269
- #endif // _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN
269
+ #endif // _PSTL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN || _ONEDPL_ICPX_OMP_SIMD_DESTROY_WINDOWS_BROKEN
270
270
constexpr _is_vector_type __is_vector;
271
271
272
272
if constexpr (::std::is_trivially_destructible_v<_ValueType>)
0 commit comments