aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2017-07-26 15:41:31 -0400
committerGravatar Thomas Van Lenten <thomasvl@google.com>2017-07-26 15:44:02 -0400
commit21800ff84ff0b68833e321e02c3c50f83047fd92 (patch)
treeee9f4727cedcf80b5bfebd2ab7bb70256236cc07 /conformance
parent8d5f2c57e81af62d414f00204dff3a1e4885c761 (diff)
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 'conformance')
-rw-r--r--conformance/conformance_objc.m6
1 files changed, 3 insertions, 3 deletions
diff --git a/conformance/conformance_objc.m b/conformance/conformance_objc.m
index ba1c946f..a5012ec4 100644
--- a/conformance/conformance_objc.m
+++ b/conformance/conformance_objc.m
@@ -63,7 +63,7 @@ static NSData *CheckedReadDataOfLength(NSFileHandle *handle, NSUInteger numBytes
static ConformanceResponse *DoTest(ConformanceRequest *request) {
ConformanceResponse *response = [ConformanceResponse message];
- TestAllTypesProto3 *testMessage = nil;
+ Proto3TestAllTypesProto3 *testMessage = nil;
switch (request.payloadOneOfCase) {
case ConformanceRequest_Payload_OneOfCase_GPBUnsetOneOfCase:
@@ -73,8 +73,8 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) {
case ConformanceRequest_Payload_OneOfCase_ProtobufPayload: {
if ([request.messageType isEqualToString:@"protobuf_test_messages.proto3.TestAllTypesProto3"]) {
NSError *error = nil;
- testMessage = [TestAllTypesProto3 parseFromData:request.protobufPayload
- error:&error];
+ testMessage = [Proto3TestAllTypesProto3 parseFromData:request.protobufPayload
+ error:&error];
if (!testMessage) {
response.parseError =
[NSString stringWithFormat:@"Parse error: %@", error];