diff options
author | Adam Cozzette <acozzette@google.com> | 2018-01-19 16:46:57 -0800 |
---|---|---|
committer | Adam Cozzette <acozzette@acozzette0.svl.corp.google.com> | 2018-01-26 16:17:14 -0800 |
commit | 39a789e657a52e835c281233b63cc2a6bb387fd4 (patch) | |
tree | 18954017db14eb09c290ddbe0425a212b14d2b28 /src/google/protobuf/compiler/javanano/javanano_file.cc | |
parent | c236896ec5a7f9c0b021f14be61ee2e0a2c7a91b (diff) |
Removed using statements from common.h
These statements pulled a bunch of symbols from the std namespace into
the global namespace. This commit removes all of them except for
std::string, which is a bit trickier to remove.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_file.cc')
-rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_file.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_file.cc b/src/google/protobuf/compiler/javanano/javanano_file.cc index 17f7386e..7a661a42 100644 --- a/src/google/protobuf/compiler/javanano/javanano_file.cc +++ b/src/google/protobuf/compiler/javanano/javanano_file.cc @@ -59,7 +59,7 @@ bool UsesExtensions(const Message& message) { // We conservatively assume that unknown fields are extensions. if (reflection->GetUnknownFields(message).field_count() > 0) return true; - vector<const FieldDescriptor*> fields; + std::vector<const FieldDescriptor*> fields; reflection->ListFields(message, &fields); for (int i = 0; i < fields.size(); i++) { @@ -216,7 +216,7 @@ static void GenerateSibling(const string& package_dir, const string& java_package, const DescriptorClass* descriptor, GeneratorContext* output_directory, - vector<string>* file_list, + std::vector<string>* file_list, const Params& params) { string filename = package_dir + descriptor->name() + ".java"; file_list->push_back(filename); @@ -239,7 +239,7 @@ static void GenerateSibling(const string& package_dir, void FileGenerator::GenerateSiblings(const string& package_dir, GeneratorContext* output_directory, - vector<string>* file_list) { + std::vector<string>* file_list) { if (params_.java_multiple_files(file_->name())) { for (int i = 0; i < file_->message_type_count(); i++) { GenerateSibling<MessageGenerator>(package_dir, java_package_, |