diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2017-06-16 11:39:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-16 11:39:11 -0700 |
commit | 710543d915ec69a7aff98301fad27dc27ef67253 (patch) | |
tree | a55f107f2eeae9538eb9f6d4918472249f9f3dd6 | |
parent | 491b32041d2c097d2604e350fee3e23c6df901bc (diff) | |
parent | 4b36d4006b55375e6bfb9902b49b9bcf43c96f4c (diff) | |
download | protobuf-710543d915ec69a7aff98301fad27dc27ef67253.tar.gz protobuf-710543d915ec69a7aff98301fad27dc27ef67253.tar.bz2 protobuf-710543d915ec69a7aff98301fad27dc27ef67253.zip |
Merge pull request #3237 from calder/patch-1
Qualify string in java_options.h
-rw-r--r-- | src/google/protobuf/compiler/java/java_options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/java/java_options.h b/src/google/protobuf/compiler/java/java_options.h index 7bce1447..e4e7d5e2 100644 --- a/src/google/protobuf/compiler/java/java_options.h +++ b/src/google/protobuf/compiler/java/java_options.h @@ -59,10 +59,10 @@ struct Options { bool annotate_code; // Name of a file where we will write a list of generated .meta file names, // one per line. - string annotation_list_file; + std::string annotation_list_file; // Name of a file where we will write a list of generated file names, one // per line. - string output_list_file; + std::string output_list_file; }; } // namespace java |