Merge pull request #37 from MiKom/fix-windows-minmax

Fortify uses of std::min/max against Windows
KDABLabs · Nov 1, 2024 · 4b715ce · 4b715ce
2 parents 5019ab2 + 362100d
commit 4b715ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cpp/duplicatetracker/include/duplicatetracker.h b/cpp/duplicatetracker/include/duplicatetracker.h
@@ -94,9 +94,9 @@ class DuplicateTrackerBase :
 
     explicit DuplicateTrackerBase(std::size_t numBuckets, const Hash &h, const Equal &e)
 #ifdef __cpp_lib_memory_resource
-        : Base(this->m_buffer, sizeof(this->m_buffer), std::max(numBuckets, Prealloc), h, e){}
+        : Base(this->m_buffer, sizeof(this->m_buffer), (std::max)(numBuckets, Prealloc), h, e){}
 #else
-        : Base(std::max(numBuckets, Prealloc), h, e)
+        : Base((std::max)(numBuckets, Prealloc), h, e)
     {
     }
 #endif

diff --git a/qt/KDStlContainerAdaptor/KDStlContainerAdaptor.h b/qt/KDStlContainerAdaptor/KDStlContainerAdaptor.h
@@ -275,7 +275,7 @@ struct StdVectorAdaptor : std::vector<T, Args...>
 
         if (len < 0)
             len = s;
-        len = std::min(len, s - pos);
+        len = (std::min)(len, s - pos);
 
         const auto b = this->begin() + pos;
         const auto e = b + len;