diff options
author | Feng Xiao <xiaofeng@google.com> | 2016-11-02 11:54:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 11:54:13 -0700 |
commit | 750b9e24287317858a666efa7b971c757e6c8236 (patch) | |
tree | 4327e7f59f71eaa02d64040f37e67711d66c967f | |
parent | 8fcd24b8dbba46748a9d880a2372736a8b1a6852 (diff) | |
parent | 4d813de095f777ed1aed7eee18c2d5fee11f7185 (diff) | |
download | protobuf-750b9e24287317858a666efa7b971c757e6c8236.tar.gz protobuf-750b9e24287317858a666efa7b971c757e6c8236.tar.bz2 protobuf-750b9e24287317858a666efa7b971c757e6c8236.zip |
Merge pull request #2318 from mavrukin/patch-1
Fix compiler warnings when running :protobuf_test
-rw-r--r-- | src/google/protobuf/compiler/mock_code_generator.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/mock_code_generator.cc b/src/google/protobuf/compiler/mock_code_generator.cc index 82bb3427..1cc932dd 100644 --- a/src/google/protobuf/compiler/mock_code_generator.cc +++ b/src/google/protobuf/compiler/mock_code_generator.cc @@ -61,7 +61,7 @@ namespace compiler { // comma-separated string. string CommaSeparatedList(const vector<const FileDescriptor*> all_files) { vector<string> names; - for (int i = 0; i < all_files.size(); i++) { + for (size_t i = 0; i < all_files.size(); i++) { names.push_back(all_files[i]->name()); } return Join(names, ","); @@ -97,7 +97,7 @@ void MockCodeGenerator::ExpectGenerated( while (!lines.empty() && lines.back().empty()) { lines.pop_back(); } - for (int i = 0; i < lines.size(); i++) { + for (size_t i = 0; i < lines.size(); i++) { lines[i] += "\n"; } @@ -114,7 +114,7 @@ void MockCodeGenerator::ExpectGenerated( EXPECT_EQ(kFirstInsertionPoint, lines[1 + insertion_list.size()]); EXPECT_EQ(kSecondInsertionPoint, lines[2 + insertion_list.size() * 2]); - for (int i = 0; i < insertion_list.size(); i++) { + for (size_t i = 0; i < insertion_list.size(); i++) { EXPECT_EQ(GetOutputFileContent(insertion_list[i], "first_insert", file, file, first_message_name), lines[1 + i]); @@ -170,7 +170,7 @@ bool MockCodeGenerator::Generate( SplitStringUsing(StripPrefixString(parameter, "insert="), ",", &insert_into); - for (int i = 0; i < insert_into.size(); i++) { + for (size_t i = 0; i < insert_into.size(); i++) { { google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(context->OpenForInsert( GetOutputFileName(insert_into[i], file), kFirstInsertionPointName)); |