libstdc++-v3/ChangeLog:

        * include/pstl/parallel_backend_tbb.h (__merge_func): Fix order
        of mem-initializers.
---

Tested x86_64-linux. Pushed to trunk.

There are still lots of -Wunknown-pragmas/-Wsign-compare/-Wunused
warnings in this header though.

 libstdc++-v3/include/pstl/parallel_backend_tbb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/pstl/parallel_backend_tbb.h 
b/libstdc++-v3/include/pstl/parallel_backend_tbb.h
index 96e4b709fbe..bb6fa8f18e8 100644
--- a/libstdc++-v3/include/pstl/parallel_backend_tbb.h
+++ b/libstdc++-v3/include/pstl/parallel_backend_tbb.h
@@ -834,7 +834,7 @@ class __merge_func
     __merge_func(_SizeType __xs, _SizeType __xe, _SizeType __ys, _SizeType 
__ye, _SizeType __zs, _Compare __comp,
                  _Cleanup, _LeafMerge __leaf_merge, _SizeType __nsort, 
_RandomAccessIterator1 __x_beg,
                  _RandomAccessIterator2 __z_beg, bool __x_orig, bool __y_orig, 
bool __root)
-        : _M_xs(__xs), _M_xe(__xe), _M_ys(__ys), _M_ye(__ye), _M_zs(__zs), 
_M_x_beg(__x_beg), _M_z_beg(__z_beg),
+        : _M_x_beg(__x_beg), _M_z_beg(__z_beg), _M_xs(__xs), _M_xe(__xe), 
_M_ys(__ys), _M_ye(__ye), _M_zs(__zs),
           _M_comp(__comp), _M_leaf_merge(__leaf_merge), _M_nsort(__nsort), 
_root(__root),
           _x_orig(__x_orig), _y_orig(__y_orig), _split(false)
     {
-- 
2.47.1

Reply via email to