diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2017-07-26 15:41:31 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2017-07-26 15:44:02 -0400 |
commit | 21800ff84ff0b68833e321e02c3c50f83047fd92 (patch) | |
tree | ee9f4727cedcf80b5bfebd2ab7bb70256236cc07 /src | |
parent | 8d5f2c57e81af62d414f00204dff3a1e4885c761 (diff) | |
download | protobuf-21800ff84ff0b68833e321e02c3c50f83047fd92.tar.gz protobuf-21800ff84ff0b68833e321e02c3c50f83047fd92.tar.bz2 protobuf-21800ff84ff0b68833e321e02c3c50f83047fd92.zip |
Add a objc_class_prefix to test_messages_proto3.proto.
Both test_messages_proto3.proto & test_messages_proto2.proto define
message ForeignMessage {...} and enum ForeignEnum {...} but since
objc doesn't use the proto package in the naming, these end up
conflicting.
Adding the objc_class_prefix option to the proto3 file ensure the generated
objc types are all unique.
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/test_messages_proto3.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/test_messages_proto3.proto b/src/google/protobuf/test_messages_proto3.proto index abf73427..84b9da99 100644 --- a/src/google/protobuf/test_messages_proto3.proto +++ b/src/google/protobuf/test_messages_proto3.proto @@ -39,6 +39,7 @@ syntax = "proto3"; package protobuf_test_messages.proto3; option java_package = "com.google.protobuf_test_messages.proto3"; +option objc_class_prefix = "Proto3"; // This is the default, but we specify it here explicitly. option optimize_for = SPEED; |