Merge pull request protocolbuffers#508 from pherl/nanfix

using ::isnan to avoid conflicts with std::isnan for C++11 build.
mbabinski-at-google · Jun 18, 2015 · d6286a9 · d6286a9
2 parents e6484d3 + a2b7937
commit d6286a9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/google/protobuf/util/internal/utility.cc b/src/google/protobuf/util/internal/utility.cc
@@ -302,7 +302,7 @@ bool IsMap(const google::protobuf::Field& field,
 string DoubleAsString(double value) {
   if (value == std::numeric_limits<double>::infinity()) return "Infinity";
   if (value == -std::numeric_limits<double>::infinity()) return "-Infinity";
-  if (isnan(value)) return "NaN";
+  if (::isnan(value)) return "NaN";
 
   return SimpleDtoa(value);
 }