diff --git a/cpp/duplicatetracker/include/duplicatetracker.h b/cpp/duplicatetracker/include/duplicatetracker.h index c6e7a71..59eec3e 100644 --- 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 index f61510a..1d7bbcd 100644 --- a/qt/KDStlContainerAdaptor/KDStlContainerAdaptor.h +++ b/qt/KDStlContainerAdaptor/KDStlContainerAdaptor.h @@ -275,7 +275,7 @@ struct StdVectorAdaptor : std::vector 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;