From 5ef42ab3e37037f9da06a4127f525fbec72dfabe Mon Sep 17 00:00:00 2001 From: Jonathan Emmett Date: Wed, 16 Jun 2021 11:16:08 -0400 Subject: [PATCH] Guard another use of std::min from Windows.h corruption The include order in test_block_indirect_sort will include Windows.h before sort.hpp on Windows, letting Windows.h corrupt unparenthesized uses of std::min. --- include/boost/sort/pdqsort/pdqsort.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/sort/pdqsort/pdqsort.hpp b/include/boost/sort/pdqsort/pdqsort.hpp index 511b4d9..8352e39 100644 --- a/include/boost/sort/pdqsort/pdqsort.hpp +++ b/include/boost/sort/pdqsort/pdqsort.hpp @@ -266,7 +266,7 @@ namespace pdqsort_detail { } // Swap elements and update block sizes and first/last boundaries. - size_t num = std::min(num_l, num_r); + size_t num = (std::min)(num_l, num_r); swap_offsets(offsets_l_base, offsets_r_base, offsets_l + start_l, offsets_r + start_r, num, num_l == num_r);