diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-11 17:09:20 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-11 17:10:28 -0800 |
| commit | e841bac4fcf47f809e089a70d5f84ac37b3883df (patch) | |
| tree | d25dc5fc814db182c04c5f276ff1a609c5965a5a /src/google/protobuf/util/field_comparator_test.cc | |
| parent | 99a6a95c751a28a3cc33dd2384959179f83f682c (diff) | |
| download | protobuf-e841bac4fcf47f809e089a70d5f84ac37b3883df.tar.gz protobuf-e841bac4fcf47f809e089a70d5f84ac37b3883df.tar.bz2 protobuf-e841bac4fcf47f809e089a70d5f84ac37b3883df.zip | |
Down-integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/util/field_comparator_test.cc')
| -rw-r--r-- | src/google/protobuf/util/field_comparator_test.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/google/protobuf/util/field_comparator_test.cc b/src/google/protobuf/util/field_comparator_test.cc index d3d34602..23f7d51d 100644 --- a/src/google/protobuf/util/field_comparator_test.cc +++ b/src/google/protobuf/util/field_comparator_test.cc @@ -35,7 +35,12 @@ #include <google/protobuf/unittest.pb.h> #include <google/protobuf/descriptor.h> #include <google/protobuf/stubs/mathutil.h> - +// This gtest header is put after mathutil.h intentionally. We have to do +// this because mathutil.h includes mathlimits.h which requires cmath not +// being included to compile on some versions of gcc: +// https://github.com/google/protobuf/blob/818c5eee08840355d70d2f3bdf1a2f17986a5e70/src/google/protobuf/stubs/mathlimits.h#L48 +// and the opensource version gtest.h header includes cmath transitively +// somehow. #include <gtest/gtest.h> namespace google { |