OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[pstl] Added missing double-underscore prefixes to some types 

Summary:
Some of the `move_` types were used with leading double-underscores, but
they were declared without `__` prefix.

This patch adds double-underscores to all `move_` types, and their uses.

Reviewers: MikeDvorskiy, ldionne, EricWF, rodgert, #libc

Reviewed By: MikeDvorskiy, ldionne, #libc

Subscribers: dexonsmith, libcxx-commits

Tags: #libc

Differential Revision: https://reviews.llvm.org/D78040
This commit is contained in:
Ismail Pazarbasi 2020-04-13 15:21:38 +02:00
parent 7c10541e56
commit f1f37b7f01
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pstl/include/pstl/internal/parallel_backend_tbb.h
View File

@ -447,7 +447,7 @@ class __merge_task : public tbb::task
return _M_nsort > 0;
}
struct move_value
struct __move_value
{
template <typename Iterator1, typename Iterator2>
void
@ -457,7 +457,7 @@ class __merge_task : public tbb::task
}
};
struct move_value_construct
struct __move_value_construct
{
template <typename Iterator1, typename Iterator2>
void
@ -467,7 +467,7 @@ class __merge_task : public tbb::task
}
};
struct move_range
struct __move_range
{
template <typename Iterator1, typename Iterator2>
Iterator2
@ -486,7 +486,7 @@ class __merge_task : public tbb::task
}
};
struct move_range_construct
struct __move_range_construct
{
template <typename Iterator1, typename Iterator2>
Iterator2
@ -495,7 +495,7 @@ class __merge_task : public tbb::task
if (__last1 - __first1 < __merge_cut_off)
{
for (; __first1 != __last1; ++__first1, ++__first2)
move_value_construct()(__first1, __first2);
__move_value_construct()(__first1, __first2);
return __first2;
}
@ -503,7 +503,7 @@ class __merge_task : public tbb::task
tbb::parallel_for(tbb::blocked_range<_SizeType>(0, __n, __merge_cut_off),
[__first1, __first2](const tbb::blocked_range<_SizeType>& __range) {
for (auto i = __range.begin(); i != __range.end(); ++i)
move_value_construct()(__first1 + i, __first2 + i);
__move_value_construct()(__first1 + i, __first2 + i);
});
return __first2 + __n;
}
@ -648,7 +648,7 @@ class __merge_task : public tbb::task
const auto __ny = (_M_ye - _M_ys);
_M_leaf_merge(_M_z_beg + _M_xs, _M_z_beg + _M_xe, _M_z_beg + _M_ys, _M_z_beg + _M_ye, _M_x_beg + _M_zs,
_M_comp, move_value(), move_value(), move_range(), move_range());
_M_comp, __move_value(), __move_value(), __move_range(), __move_range());
__cleanup_range()(_M_z_beg + _M_xs, _M_z_beg + _M_xe);
__cleanup_range()(_M_z_beg + _M_ys, _M_z_beg + _M_ye);