Index: third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc |
diff --git a/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc b/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc |
index 6fd631d860c8fc63e0279ed817e1941f2597e162..249b8d54632ae4595b361aa032117da5634e4506 100644 |
--- a/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc |
+++ b/third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc |
@@ -365,10 +365,10 @@ TEST_F(DefaultFieldComparatorTest, |
// +inf should be equal even though they are not technically within margin or |
// fraction. |
- message_1_.set_optional_float(numeric_limits<float>::infinity()); |
- message_2_.set_optional_float(numeric_limits<float>::infinity()); |
- message_1_.set_optional_double(numeric_limits<double>::infinity()); |
- message_2_.set_optional_double(numeric_limits<double>::infinity()); |
+ message_1_.set_optional_float(std::numeric_limits<float>::infinity()); |
+ message_2_.set_optional_float(std::numeric_limits<float>::infinity()); |
+ message_1_.set_optional_double(std::numeric_limits<double>::infinity()); |
+ message_2_.set_optional_double(std::numeric_limits<double>::infinity()); |
comparator_.SetFractionAndMargin(field_float, 0.0, 0.0); |
comparator_.SetFractionAndMargin(field_double, 0.0, 0.0); |
EXPECT_EQ(FieldComparator::SAME, |
@@ -380,10 +380,10 @@ TEST_F(DefaultFieldComparatorTest, |
// -inf should be equal even though they are not technically within margin or |
// fraction. |
- message_1_.set_optional_float(-numeric_limits<float>::infinity()); |
- message_2_.set_optional_float(-numeric_limits<float>::infinity()); |
- message_1_.set_optional_double(-numeric_limits<double>::infinity()); |
- message_2_.set_optional_double(-numeric_limits<double>::infinity()); |
+ message_1_.set_optional_float(-std::numeric_limits<float>::infinity()); |
+ message_2_.set_optional_float(-std::numeric_limits<float>::infinity()); |
+ message_1_.set_optional_double(-std::numeric_limits<double>::infinity()); |
+ message_2_.set_optional_double(-std::numeric_limits<double>::infinity()); |
comparator_.SetFractionAndMargin(field_float, 0.0, 0.0); |
comparator_.SetFractionAndMargin(field_double, 0.0, 0.0); |
EXPECT_EQ(FieldComparator::SAME, |