aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jisi Liu <jisi.liu@gmail.com>2015-06-18 13:35:24 -0700
committerGravatar Jisi Liu <jisi.liu@gmail.com>2015-06-18 13:35:24 -0700
commita2b7937777122b1397ada4b20da5cfc66b349107 (patch)
tree1f2644dc6701fc7156421d9e5ac5e6a5cf92688a
parente6484d306d584634b4a2c2f8626e5abebf390d37 (diff)
using ::isnan to avoid conflicts with std::isnan for C++11 build.
Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
-rw-r--r--src/google/protobuf/util/internal/utility.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/utility.cc b/src/google/protobuf/util/internal/utility.cc
index b6ec19b6..f550f43b 100644
--- 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);
}