diff options
| author | Jisi Liu <liujisi@google.com> | 2015-06-18 13:38:07 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2015-06-18 13:38:07 -0700 |
| commit | d6286a9f41be0b0c3c0f46721c28c4a8c7d1ccf3 (patch) | |
| tree | 1f2644dc6701fc7156421d9e5ac5e6a5cf92688a | |
| parent | e6484d306d584634b4a2c2f8626e5abebf390d37 (diff) | |
| parent | a2b7937777122b1397ada4b20da5cfc66b349107 (diff) | |
| download | protobuf-d6286a9f41be0b0c3c0f46721c28c4a8c7d1ccf3.tar.gz protobuf-d6286a9f41be0b0c3c0f46721c28c4a8c7d1ccf3.tar.bz2 protobuf-d6286a9f41be0b0c3c0f46721c28c4a8c7d1ccf3.zip | |
Merge pull request #508 from pherl/nanfix
using ::isnan to avoid conflicts with std::isnan for C++11 build.
| -rw-r--r-- | src/google/protobuf/util/internal/utility.cc | 2 |
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); } |