refactor to allow MSVC without #define NOMINMAX

PhilipDeegan · PhilipDeegan · commit 5863e9b36ec5 · 2020-06-25T23:04:26.000+02:00
diff --git a/include/yaml-cpp/node/convert.h b/include/yaml-cpp/node/convert.h
@@ -120,15 +120,16 @@ 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() &&
-        num <= std::numeric_limits<T>::max()) {
+    if (num >= (std::numeric_limits<T>::min)() &&
+        num <= (std::numeric_limits<T>::max)()) {
       rhs = num;
       return true;
     }
   }
   return false;
 }
 
+
 template <typename T>
 typename std::enable_if<!(std::is_same<T, unsigned char>::value ||
                           std::is_same<T, signed char>::value), bool>::type

Original file line number	Diff line number	Diff line change
`@@ -120,15 +120,16 @@ typename std::enable_if<(std::is_same<T, unsigned char>::value \|\|`
`120`	`120`	`ConvertStreamTo(std::stringstream& stream, T& rhs) {`
`121`	`121`	`int num;`
`122`	`122`	`if ((stream >> std::noskipws >> num) && (stream >> std::ws).eof()) {`
`123`		`- if (num >= std::numeric_limits<T>::min() &&`
`124`		`- num <= std::numeric_limits<T>::max()) {`
	`123`	`+ if (num >= (std::numeric_limits<T>::min)() &&`
	`124`	`+ num <= (std::numeric_limits<T>::max)()) {`
`125`	`125`	`rhs = num;`
`126`	`126`	`return true;`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`return false;`
`130`	`130`	`}`
`131`	`131`
	`132`	`+`
`132`	`133`	`template <typename T>`
`133`	`134`	`typename std::enable_if<!(std::is_same<T, unsigned char>::value \|\|`
`134`	`135`	`std::is_same<T, signed char>::value), bool>::type`