From a2b7937777122b1397ada4b20da5cfc66b349107 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Thu, 18 Jun 2015 13:35:24 -0700 Subject: using ::isnan to avoid conflicts with std::isnan for C++11 build. Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b --- src/google/protobuf/util/internal/utility.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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::infinity()) return "Infinity"; if (value == -std::numeric_limits::infinity()) return "-Infinity"; - if (isnan(value)) return "NaN"; + if (::isnan(value)) return "NaN"; return SimpleDtoa(value); } -- cgit v1.2.3