Merge pull request #508 from pherl/nanfix

using ::isnan to avoid conflicts with std::isnan for C++11 build.

Merge pull request #508 from pherl/nanfix
using ::isnan to avoid conflicts with std::isnan for C++11 build.
d6286a9f · Jisi Liu · e6484d30 · a2b79377 · d6286a9f
Commit d6286a9f authored Jun 18, 2015 by Jisi Liu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

utility.cc src/google/protobuf/util/internal/utility.cc +1 -1

No files found.
--- 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);
 }