Index: third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc |
index 44bafd7f3c2ffe9abca0b5f12bbe36aadde10767..5531ae249f86102d4873e2673a4af612385d18fa 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc |
@@ -53,7 +53,7 @@ OneofGenerator::OneofGenerator(const OneofDescriptor* descriptor) |
string comments; |
SourceLocation location; |
if (descriptor_->GetSourceLocation(&location)) { |
- comments = BuildCommentsString(location); |
+ comments = BuildCommentsString(location, true); |
} else { |
comments = ""; |
} |
@@ -104,7 +104,9 @@ void OneofGenerator::GeneratePublicCasePropertyDeclaration( |
void OneofGenerator::GenerateClearFunctionDeclaration(io::Printer* printer) { |
printer->Print( |
variables_, |
- "/// Clears whatever value was set for the oneof '$name$'.\n" |
+ "/**\n" |
+ " * Clears whatever value was set for the oneof '$name$'.\n" |
+ " **/\n" |
"void $owning_message_class$_Clear$capitalized_name$OneOfCase($owning_message_class$ *message);\n"); |
} |
@@ -119,7 +121,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"); |
} |