diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-08-25 16:32:01 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-25 16:32:01 -0700 |
| commit | 56c4f57bb0d3c76476947a99d6584df62b6d0805 (patch) | |
| tree | 1e0a34fed1cc5ba6d51b72fdf742c2419a49ed84 /src/google/protobuf/util | |
| parent | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (diff) | |
| parent | 992531723cad417b4035d54dbca598d19868b69a (diff) | |
Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1
Manually merge pull request: https://github.com/google/protobuf/pull/674
that fixes the gcc C++11 build.
Diffstat (limited to 'src/google/protobuf/util')
| -rw-r--r-- | src/google/protobuf/util/field_comparator_test.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/util/internal/utility.cc | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/google/protobuf/util/field_comparator_test.cc b/src/google/protobuf/util/field_comparator_test.cc index 748c7d11..845839ac 100644 --- a/src/google/protobuf/util/field_comparator_test.cc +++ b/src/google/protobuf/util/field_comparator_test.cc @@ -34,8 +34,8 @@ #include <google/protobuf/unittest.pb.h> #include <google/protobuf/descriptor.h> -#include <gtest/gtest.h> #include <google/protobuf/stubs/mathutil.h> +#include <gtest/gtest.h> namespace google { namespace protobuf { diff --git a/src/google/protobuf/util/internal/utility.cc b/src/google/protobuf/util/internal/utility.cc index 794777d4..dfc4add2 100644 --- a/src/google/protobuf/util/internal/utility.cc +++ b/src/google/protobuf/util/internal/utility.cc @@ -30,10 +30,6 @@ #include <google/protobuf/util/internal/utility.h> -#include <cmath> -#include <algorithm> -#include <utility> - #include <google/protobuf/stubs/common.h> #include <google/protobuf/wrappers.pb.h> #include <google/protobuf/descriptor.pb.h> @@ -301,8 +297,8 @@ 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 (google::protobuf::MathLimits<double>::IsPosInf(value)) return "Infinity"; + if (google::protobuf::MathLimits<double>::IsNegInf(value)) return "-Infinity"; if (google::protobuf::MathLimits<double>::IsNaN(value)) return "NaN"; return SimpleDtoa(value); @@ -320,8 +316,7 @@ bool SafeStrToFloat(StringPiece str, float *value) { } *value = static_cast<float>(double_value); - if ((*value == numeric_limits<float>::infinity()) || - (*value == -numeric_limits<float>::infinity())) { + if (google::protobuf::MathLimits<float>::IsInf(*value)) { return false; } return true; |