Refactor to allow MSVC without #define NOMINMAX (#905)

27d8a0e3 · Dekken · GitHub · 97d1ae54 · 27d8a0e3
Unverified Commit 27d8a0e3 authored Jun 28, 2020 by Dekken Committed by GitHub Jun 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

include/yaml-cpp/node/convert.h include/yaml-cpp/node/convert.h +2 -2

No files found.
--- a/include/yaml-cpp/node/convert.h
+++ b/include/yaml-cpp/node/convert.h
@@ -120,8 +120,8 @@ typename std::enable_if<(std::is_same<T, unsigned char>::value ||
 ConvertStreamTo(std::stringstream& stream, T& rhs) {
  int num;
  if ((stream >> std::noskipws >> num) && (stream >> std::ws).eof()) {
-    if (num >= std::numeric_limits<T>::min() &&
+    if (num >= (std::numeric_limits<T>::min)() &&
-        num <= std::numeric_limits<T>::max()) {
+        num <= (std::numeric_limits<T>::max)()) {
      rhs = num;
      return true;
    }