diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2016-07-19 11:37:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 11:37:15 -0700 |
| commit | a5ba78487d757debe34f6aff9def586d87158a8a (patch) | |
| tree | 70c054983ff0d052673e8e68733b0c0f247c9747 | |
| parent | 56855f6f002eeee8cf03021eaf2ece2adff2a297 (diff) | |
| parent | 9707365756900484acba504e4c09b7b2828d9354 (diff) | |
| download | protobuf-a5ba78487d757debe34f6aff9def586d87158a8a.tar.gz protobuf-a5ba78487d757debe34f6aff9def586d87158a8a.tar.bz2 protobuf-a5ba78487d757debe34f6aff9def586d87158a8a.zip | |
Merge pull request #1808 from jcanizales/3.0.0-beta-4
Cherrypick: Use public methods to fetch oneofs in generated code.
| -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"); } |