diff options
| author |  Calder Coalson <caldercoalson@gmail.com> | 2017-06-16 07:06:09 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-16 07:06:09 -0700 |
| commit | 4b36d4006b55375e6bfb9902b49b9bcf43c96f4c (patch) | |
| tree | 860d0e2c6b25ced2ef333b5f41788382db4b6bbf /src | |
| parent | 91bf623aa145cd1576451ed3764a64a089384ac4 (diff) | |
Qualify string in java_options.h
Building the protobuf compiler with Bazel fails to resolve the unqualifed "string"s in java_options.h:
```
ERROR: .../external/com_google_protobuf/BUILD:248:1: C++ compilation of rule '@com_google_protobuf//:protoc_lib' failed: Process exited with status 1 [sandboxed].
In file included from external/com_google_protobuf/src/google/protobuf/compiler/java/java_context.h:41:0,
from external/com_google_protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.cc:38:
external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:59:3: error: 'string' does not name a type
string annotation_list_file;
^
external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:62:3: error: 'string' does not name a type
string output_list_file;
^
Use --strategy=CppCompile=standalone to disable sandboxing for the failing actions.
INFO: Elapsed time: 41.487s, Critical Path: 6.20s
//interpreter:eval_test NO STATUS
Executed 0 out of 1 test: 1 was skipped.
```
Diffstat (limited to 'src')
| -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 |