Suppress warning C4127

Splitting the condition of the if statement containing `constant expression` eliminates warnings in Visual Studio with /W4.
2019-02-12 09:42:45 +09:00 · 2019-02-12 09:42:45 +09:00 · 94b7f599da
commit 94b7f599da
parent b87c76a2ef
1 changed files with 5 additions and 4 deletions
--- a/include/yaml-cpp/node/convert.h
+++ b/include/yaml-cpp/node/convert.h
@ -116,10 +116,11 @@ struct convert<_Null> {
        }                                                                \
      }                                                                  \
                                                                         \
-      if (std::numeric_limits<type>::has_quiet_NaN &&                    \
-          conversion::IsNaN(input)) {                                    \
-        rhs = std::numeric_limits<type>::quiet_NaN();                    \
-        return true;                                                     \
+      if (std::numeric_limits<type>::has_quiet_NaN) {                    \
+        if (conversion::IsNaN(input)) {                                  \
+          rhs = std::numeric_limits<type>::quiet_NaN();                  \
+          return true;                                                   \
+        }                                                                \
      }                                                                  \
                                                                         \
      return false;                                                      \