diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
| commit | d61aede89cf188367766b971f59cf57d7835d8e8 (patch) | |
| tree | a19842c62c3c8f51389912ecafdf932d0a572bea /src/google/protobuf/compiler/java/java_shared_code_generator.h | |
| parent | 45d03a977193d1dcce5251e4bffe17bf0ba738ec (diff) | |
| download | protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.gz protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.bz2 protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/compiler/java/java_shared_code_generator.h')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_shared_code_generator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/java/java_shared_code_generator.h b/src/google/protobuf/compiler/java/java_shared_code_generator.h index 1eb6feaf..2f09c3a9 100644 --- a/src/google/protobuf/compiler/java/java_shared_code_generator.h +++ b/src/google/protobuf/compiler/java/java_shared_code_generator.h @@ -70,8 +70,8 @@ class SharedCodeGenerator { ~SharedCodeGenerator(); void Generate(GeneratorContext* generator_context, - std::vector<string>* file_list, - std::vector<string>* annotation_file_list); + std::vector<std::string>* file_list, + std::vector<std::string>* annotation_file_list); void GenerateDescriptors(io::Printer* printer); |