AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1

Browse Source 
Manually merge pull request: https://github.com/google/protobuf/pull/674
that fixes the gcc C++11 build.
This commit is contained in:
Jisi Liu 2015-08-25 16:32:01 -07:00
commit 56c4f57bb0
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/google/protobuf/util/field_comparator_test.cc
View File

@ -34,8 +34,8 @@
#include <google/protobuf/unittest.pb.h> #include <google/protobuf/unittest.pb.h>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <gtest/gtest.h>
#include <google/protobuf/stubs/mathutil.h> #include <google/protobuf/stubs/mathutil.h>
#include <gtest/gtest.h>
namespace google { namespace google {
namespace protobuf { namespace protobuf {

11
src/google/protobuf/util/internal/utility.cc
View File

@ -30,10 +30,6 @@
#include <google/protobuf/util/internal/utility.h> #include <google/protobuf/util/internal/utility.h>
#include <cmath>
#include <algorithm>
#include <utility>
#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/common.h>
#include <google/protobuf/wrappers.pb.h> #include <google/protobuf/wrappers.pb.h>
#include <google/protobuf/descriptor.pb.h> #include <google/protobuf/descriptor.pb.h>
@ -301,8 +297,8 @@ bool IsMap(const google::protobuf::Field& field,
} }
string DoubleAsString(double value) { string DoubleAsString(double value) {
if (value == std::numeric_limits<double>::infinity()) return "Infinity"; if (google::protobuf::MathLimits<double>::IsPosInf(value)) return "Infinity";
if (value == -std::numeric_limits<double>::infinity()) return "-Infinity"; if (google::protobuf::MathLimits<double>::IsNegInf(value)) return "-Infinity";
if (google::protobuf::MathLimits<double>::IsNaN(value)) return "NaN"; if (google::protobuf::MathLimits<double>::IsNaN(value)) return "NaN";
return SimpleDtoa(value); return SimpleDtoa(value);
@ -320,8 +316,7 @@ bool SafeStrToFloat(StringPiece str, float *value) {
} }
*value = static_cast<float>(double_value); *value = static_cast<float>(double_value);
if ((*value == numeric_limits<float>::infinity()) || if (google::protobuf::MathLimits<float>::IsInf(*value)) {
(*value == -numeric_limits<float>::infinity())) {
return false; return false;
} }
return true; return true;