third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/util/field_comparator_test.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 347 matching lines @@
   comparator_.SetFractionAndMargin(field_double, 0.0, 0.0);
   EXPECT_EQ(FieldComparator::SAME,
             comparator_.Compare(message_1_, message_2_,
                                 field_float, -1, -1, NULL));
   EXPECT_EQ(FieldComparator::DIFFERENT,
             comparator_.Compare(message_1_, message_2_,
                                 field_double, -1, -1, NULL));
 
   // +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,
             comparator_.Compare(message_1_, message_2_,
                                 field_float, -1, -1, NULL));
   EXPECT_EQ(FieldComparator::SAME,
             comparator_.Compare(message_1_, message_2_,
                                 field_double, -1, -1, NULL));
 
   // -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,
             comparator_.Compare(message_1_, message_2_,
                                 field_float, -1, -1, NULL));
   EXPECT_EQ(FieldComparator::SAME,
             comparator_.Compare(message_1_, message_2_,
                                 field_double, -1, -1, NULL));
 }
 
@@ skipping 82 matching lines @@
   EXPECT_EQ(FieldComparator::DIFFERENT,
             comparator_.Compare(message_1_, message_2_, field, 1, 1, NULL));
   EXPECT_EQ(FieldComparator::SAME,
             comparator_.Compare(message_1_, message_2_, field, 1, 0, NULL));
 }
 
 }  // namespace util
 }  // namespace protobuf
 }  // namespace
 }  // namespace google