浏览代码

Merge pull request #508 from pherl/nanfix

using ::isnan to avoid conflicts with std::isnan for C++11 build.
Jisi Liu 10 年之前
父节点
当前提交
d6286a9f41
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/google/protobuf/util/internal/utility.cc

+ 1 - 1
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);
 }