[libcxx-commits] [PATCH] D78040: [pstl] Added missing double-underscore prefixes to some types

[Ismail Pazarbasi via Phabricator via libcxx-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGf1f37b7f0126: [pstl] Added missing double-underscore prefixes to some types (authored by ismailp).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D78040/new/

https://reviews.llvm.org/D78040

Files:
  pstl/include/pstl/internal/parallel_backend_tbb.h


Index: pstl/include/pstl/internal/parallel_backend_tbb.h
===================================================================
--- pstl/include/pstl/internal/parallel_backend_tbb.h
+++ pstl/include/pstl/internal/parallel_backend_tbb.h
@@ -447,7 +447,7 @@
         return _M_nsort > 0;
     }
 
-    struct move_value
+    struct __move_value
     {
         template <typename Iterator1, typename Iterator2>
         void
@@ -457,7 +457,7 @@
         }
     };
 
-    struct move_value_construct
+    struct __move_value_construct
     {
         template <typename Iterator1, typename Iterator2>
         void
@@ -467,7 +467,7 @@
         }
     };
 
-    struct move_range
+    struct __move_range
     {
         template <typename Iterator1, typename Iterator2>
         Iterator2
@@ -486,7 +486,7 @@
         }
     };
 
-    struct move_range_construct
+    struct __move_range_construct
     {
         template <typename Iterator1, typename Iterator2>
         Iterator2
@@ -495,7 +495,7 @@
             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 @@
             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 @@
             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);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D78040.257818.patch
Type: text/x-patch
Size: 2402 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20200415/00b353a6/attachment.bin>