Guard std::min calls against windows.h inclusion

Author: Morwenn

include/gfx/timsort.hpp

@@ -522,7 +522,7 @@ template <typename RandomAccessIterator, typename Compare> class TimSort {
 
         epilogue: // merge what is left from either cursor1 or cursor2
 
-        minGallop_ = std::min(minGallop, 1);
+        minGallop_ = (std::min)(minGallop, 1);
 
         if (len1 == 1) {
             GFX_TIMSORT_ASSERT(len2 > 0);
@@ -640,7 +640,7 @@ template <typename RandomAccessIterator, typename Compare> class TimSort {
 
         epilogue: // merge what is left from either cursor1 or cursor2
 
-        minGallop_ = std::min(minGallop, 1);
+        minGallop_ = (std::min)(minGallop, 1);
 
         if (len2 == 1) {
             GFX_TIMSORT_ASSERT(len1 > 0);
@@ -688,7 +688,7 @@ template <typename RandomAccessIterator, typename Compare> class TimSort {
             diff_t runLen = countRunAndMakeAscending(cur, hi, compare);
 
             if (runLen < minRun) {
-                diff_t const force = std::min(nRemaining, minRun);
+                diff_t const force = (std::min)(nRemaining, minRun);
                 binarySort(cur, cur + force, cur + runLen, compare);
                 runLen = force;
             }

tests/CMakeLists.txt

@@ -94,8 +94,21 @@ add_executable(cxx_11_tests
 configure_tests(cxx_11_tests)
 target_compile_features(cxx_11_tests PRIVATE cxx_std_11)
 
+# Windows-specific tests
+if (WIN32)
+    add_executable(windows_tests
+        main.cpp
+        windows.cpp
+    )
+    configure_tests(windows_tests)
+    target_compile_features(windows_tests PRIVATE cxx_std_98)
+endif()
+
 include(CTest)
 include(ParseAndAddCatchTests)
 
 ParseAndAddCatchTests(cxx_98_tests)
 ParseAndAddCatchTests(cxx_11_tests)
+if (WIN32)
+    ParseAndAddCatchTests(windows_tests)
+endif()

tests/windows.cpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2011 Fuji, Goro (gfx) <[email protected]>.
+ * Copyright (c) 2019 Morwenn.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include <algorithm>
+#include <deque>
+#include <stdexcept>
+#include <utility>
+#include <vector>
+#include <catch.hpp>
+#include <windows.h>
+#include <gfx/timsort.hpp>
+
+TEST_CASE( "check inclusion of windows.h" ) {
+    const int size = 100;
+
+    std::vector<int> vec;
+    for (int i = 0; i < size; ++i) {
+        vec.push_back(i);
+    }
+
+    std::random_shuffle(vec.begin(), vec.end());
+    gfx::timsort(vec.begin(), vec.end());
+
+    for (int i = 0; i < size; ++i) {
+        CHECK(vec[i] == i);
+    }
+}