diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-07-18 11:10:02 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-07-18 11:10:02 -0400 |
commit | 2e98ed5d17e2e9a8cb557cc762883b792bc4a342 (patch) | |
tree | d89dbfcbe91c79ccbfd98ba871fe69fa03f457cb | |
parent | b99577c5ac3f3627f7eb11c866fad887920d1453 (diff) | |
download | protobuf-2e98ed5d17e2e9a8cb557cc762883b792bc4a342.tar.gz protobuf-2e98ed5d17e2e9a8cb557cc762883b792bc4a342.tar.bz2 protobuf-2e98ed5d17e2e9a8cb557cc762883b792bc4a342.zip |
Use public methods to fetch oneofs in generated code.
When building into frameworks, the generated code doesn't always have direct
access to the proto internals. Instead of opening up the access, just use the
public method to fetch the correct oneof.
Fixes https://github.com/google/protobuf/issues/1789
-rw-r--r-- | objectivec/google/protobuf/Struct.pbobjc.m | 2 | ||||
-rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_oneof.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/google/protobuf/Struct.pbobjc.m b/objectivec/google/protobuf/Struct.pbobjc.m index 538faab3..8ea1f124 100644 --- a/objectivec/google/protobuf/Struct.pbobjc.m +++ b/objectivec/google/protobuf/Struct.pbobjc.m @@ -237,7 +237,7 @@ void SetGPBValue_NullValue_RawValue(GPBValue *message, int32_t value) { void GPBValue_ClearKindOneOfCase(GPBValue *message) { GPBDescriptor *descriptor = [message descriptor]; - GPBOneofDescriptor *oneof = descriptor->oneofs_[0]; + GPBOneofDescriptor *oneof = [descriptor.oneofs objectAtIndex:0]; GPBMaybeClearOneof(message, oneof, -1, 0); } #pragma mark - GPBListValue diff --git a/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc b/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc index 44bafd7f..3dda903b 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc @@ -119,7 +119,7 @@ void OneofGenerator::GenerateClearFunctionImplementation(io::Printer* printer) { variables_, "void $owning_message_class$_Clear$capitalized_name$OneOfCase($owning_message_class$ *message) {\n" " GPBDescriptor *descriptor = [message descriptor];\n" - " GPBOneofDescriptor *oneof = descriptor->oneofs_[$raw_index$];\n" + " GPBOneofDescriptor *oneof = [descriptor.oneofs objectAtIndex:$raw_index$];\n" " GPBMaybeClearOneof(message, oneof, $index$, 0);\n" "}\n"); } |