Skip to content

Commit 3d34efa

Browse files
[oneDPL] Simplify constructor calls (#1532)
1 parent 7acd35b commit 3d34efa

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

include/oneapi/dpl/pstl/algorithm_impl.h

+2-10
Original file line numberDiff line numberDiff line change
@@ -1494,12 +1494,7 @@ __remove_elements(__parallel_tag<_IsVector>, _ExecutionPolicy&& __exec, _RandomA
14941494
[=](_DifferenceType __i, _DifferenceType __len, _DifferenceType __initial) {
14951495
__internal::__brick_copy_by_mask(
14961496
__first + __i, __first + __i + __len, __result + __initial, __mask + __i,
1497-
[](_RandomAccessIterator __x, _Tp* __z) {
1498-
if constexpr (::std::is_trivial_v<_Tp>)
1499-
*__z = ::std::move(*__x);
1500-
else
1501-
::new (::std::addressof(*__z)) _Tp(::std::move(*__x));
1502-
},
1497+
[](_RandomAccessIterator __x, _Tp* __z) { ::new (std::addressof(*__z)) _Tp(std::move(*__x)); },
15031498
_IsVector{});
15041499
},
15051500
[&__m](_DifferenceType __total) { __m = __total; });
@@ -3092,10 +3087,7 @@ __pattern_inplace_merge(__parallel_tag<_IsVector>, _ExecutionPolicy&& __exec, _R
30923087
_Tp* __r = __buf.get();
30933088
__internal::__except_handler([&]() {
30943089
auto __move_values = [](_RandomAccessIterator __x, _Tp* __z) {
3095-
if constexpr (::std::is_trivial_v<_Tp>)
3096-
*__z = ::std::move(*__x);
3097-
else
3098-
::new (::std::addressof(*__z)) _Tp(::std::move(*__x));
3090+
::new (std::addressof(*__z)) _Tp(std::move(*__x));
30993091
};
31003092

31013093
auto __move_sequences = [](_RandomAccessIterator __first1, _RandomAccessIterator __last1, _Tp* __first2) {

include/oneapi/dpl/pstl/memory_impl.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,8 @@ struct __op_uninitialized_copy<_ExecutionPolicy>
119119
operator()(_SourceT&& __source, _TargetT& __target) const
120120
{
121121
using _TargetValueType = std::decay_t<_TargetT>;
122-
if constexpr (std::is_trivial_v<_TargetValueType>)
123-
__target = std::forward<_SourceT>(__source);
124-
else
125-
::new (std::addressof(__target)) _TargetValueType(std::forward<_SourceT>(__source));
122+
123+
::new (std::addressof(__target)) _TargetValueType(std::forward<_SourceT>(__source));
126124
}
127125
};
128126

0 commit comments

Comments
 (0)