update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / sort / flat_stable_sort / flat_stable_sort.hpp

diff --git a/ceph/src/boost/boost/sort/flat_stable_sort/flat_stable_sort.hpp b/ceph/src/boost/boost/sort/flat_stable_sort/flat_stable_sort.hpp
index ee48e7b9a02775c7fc45d40c33d2e0e6d9086f4b..ac9c517c7e959b044f7b6bad952e974485f0aec3 100644 (file)
--- a/ceph/src/boost/boost/sort/flat_stable_sort/flat_stable_sort.hpp
+++ b/ceph/src/boost/boost/sort/flat_stable_sort/flat_stable_sort.hpp
@@ -179,7 +179,7 @@ bool flat_stable_sort <Iter_t, Compare, Power2>
     size_t nblock = size_t(itx_last - itx_first);
     range_it rng = get_group_range(*itx_first, nblock);
     size_t nelem = rng.size();
-    size_t min_process = std::max(BLOCK_SIZE, (nelem >> 3));
+    size_t min_process = (std::max)(BLOCK_SIZE, (nelem >> 3));
 
     size_t nsorted1 = bsc::number_stable_sorted_forward (rng.first, rng.last,
                                                          min_process, cmp);
@@ -221,7 +221,7 @@ bool flat_stable_sort <Iter_t, Compare, Power2>
     range_it rng = get_group_range(*itx_first, nblock);
 
     size_t nelem = rng.size();
-    size_t min_process = std::max(BLOCK_SIZE, (nelem >> 3));
+    size_t min_process = (std::max)(BLOCK_SIZE, (nelem >> 3));
 
     size_t nsorted2 = bsc::number_stable_sorted_backward(rng.first, rng.last,
                                                          min_process, cmp);