Wrap std::min in parens to avoid conflicts with macros

morganstanley · Oct 11, 2022 · 5ce1f8c · 5ce1f8c
1 parent 6f70d1f
commit 5ce1f8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/kafka/Log.h b/include/kafka/Log.h
@@ -32,7 +32,7 @@ struct Log
         static const std::vector<std::string> levelNames = {"EMERG", "ALERT", "CRIT", "ERR", "WARNING", "NOTICE", "INFO", "DEBUG", "INVALID"};
         static const std::size_t              maxIndex   = levelNames.size() - 1;
 
-        return levelNames[std::min(level, maxIndex)];
+        return levelNames[(std::min)(level, maxIndex)];
     }
 };
 
@@ -57,7 +57,7 @@ class LogBuffer
         auto cnt = std::snprintf(_wptr, capacity(), format, args...); // returns number of characters written if successful (not including '\0')
         if (cnt > 0)
         {
-            _wptr = std::min(_wptr + cnt, _buf.data() + MAX_CAPACITY - 1);
+            _wptr = (std::min)(_wptr + cnt, _buf.data() + MAX_CAPACITY - 1);
         }
         return *this;
     }

diff --git a/tests/unit/TestUnorderedOffsetCommitQueue.cc b/tests/unit/TestUnorderedOffsetCommitQueue.cc
@@ -134,7 +134,7 @@ auto checkTimeMsConsumedToSortOffsets(std::size_t testNum, std::size_t step)
     std::mt19937 g(rd());
     for (std::size_t iBegin = 0; iBegin < ackSequence.size(); iBegin += step)
     {
-        std::size_t iEnd = std::min(iBegin + step, ackSequence.size());
+        std::size_t iEnd = (std::min)(iBegin + step, ackSequence.size());
         std::shuffle(ackSequence.begin() + static_cast<int64_t>(iBegin), ackSequence.begin() + static_cast<int64_t>(iEnd), g);
     }