| Index: third_party/protobuf/src/google/protobuf/unknown_field_set_unittest.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/unknown_field_set_unittest.cc b/third_party/protobuf/src/google/protobuf/unknown_field_set_unittest.cc
|
| index 5de72630a6f32121cff56de927c804c48cb15899..e55bb012741a2220d9bf78fb26f9c9710aa75964 100644
|
| --- a/third_party/protobuf/src/google/protobuf/unknown_field_set_unittest.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/unknown_field_set_unittest.cc
|
| @@ -488,7 +488,7 @@ TEST_F(UnknownFieldSetTest, UnknownEnumValue) {
|
| TEST_F(UnknownFieldSetTest, SpaceUsedExcludingSelf) {
|
| UnknownFieldSet empty;
|
| empty.AddVarint(1, 0);
|
| - EXPECT_EQ(sizeof(vector<UnknownField>) + sizeof(UnknownField),
|
| + EXPECT_EQ(sizeof(std::vector<UnknownField>) + sizeof(UnknownField),
|
| empty.SpaceUsedExcludingSelf());
|
| }
|
|
|
| @@ -559,8 +559,9 @@ TEST_F(UnknownFieldSetTest, DeleteSubrange) {
|
| }
|
| }
|
|
|
| -void CheckDeleteByNumber(const vector<int>& field_numbers, int deleted_number,
|
| - const vector<int>& expected_field_nubmers) {
|
| +void CheckDeleteByNumber(const std::vector<int>& field_numbers,
|
| + int deleted_number,
|
| + const std::vector<int>& expected_field_nubmers) {
|
| UnknownFieldSet unknown_fields;
|
| for (int i = 0; i < field_numbers.size(); ++i) {
|
| unknown_fields.AddFixed32(field_numbers[i], i);
|
| @@ -573,9 +574,9 @@ void CheckDeleteByNumber(const vector<int>& field_numbers, int deleted_number,
|
| }
|
| }
|
|
|
| -#define MAKE_VECTOR(x) vector<int>(x, x + GOOGLE_ARRAYSIZE(x))
|
| +#define MAKE_VECTOR(x) std::vector<int>(x, x + GOOGLE_ARRAYSIZE(x))
|
| TEST_F(UnknownFieldSetTest, DeleteByNumber) {
|
| - CheckDeleteByNumber(vector<int>(), 1, vector<int>());
|
| + CheckDeleteByNumber(std::vector<int>(), 1, std::vector<int>());
|
| static const int kTestFieldNumbers1[] = {1, 2, 3};
|
| static const int kFieldNumberToDelete1 = 1;
|
| static const int kExpectedFieldNumbers1[] = {2, 3};
|
|
|