Index: third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc |
index 527b7c0c7057ffbdee0de3fcc24ef0684405b907..66cb4a16084a0372687bf75d324faa96dfa35bd1 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc |
@@ -64,7 +64,7 @@ void SetCommonFieldVariables(const FieldDescriptor* descriptor, |
SourceLocation location; |
if (descriptor->GetSourceLocation(&location)) { |
- (*variables)["comments"] = BuildCommentsString(location, true); |
+ (*variables)["comments"] = BuildCommentsString(location); |
} else { |
(*variables)["comments"] = "\n"; |
} |
@@ -93,7 +93,7 @@ void SetCommonFieldVariables(const FieldDescriptor* descriptor, |
field_flags.push_back("GPBFieldHasEnumDescriptor"); |
} |
- (*variables)["fieldflags"] = BuildFlagsString(FLAGTYPE_FIELD, field_flags); |
+ (*variables)["fieldflags"] = BuildFlagsString(field_flags); |
(*variables)["default"] = DefaultValue(descriptor); |
(*variables)["default_name"] = GPBGenericValueFieldName(descriptor); |
@@ -228,7 +228,7 @@ int FieldGenerator::ExtraRuntimeHasBitsNeeded(void) const { |
void FieldGenerator::SetExtraRuntimeHasBitsBase(int index_base) { |
// NOTE: src/google/protobuf/compiler/plugin.cc makes use of cerr for some |
// error cases, so it seems to be ok to use as a back door for errors. |
- cerr << "Error: should have overridden SetExtraRuntimeHasBitsBase()." << endl; |
+ cerr << "Error: should have overriden SetExtraRuntimeHasBitsBase()." << endl; |
cerr.flush(); |
abort(); |
} |
@@ -335,7 +335,7 @@ void ObjCObjFieldGenerator::GeneratePropertyDeclaration( |
if (WantsHasProperty()) { |
printer->Print( |
variables_, |
- "/** Test to see if @c $name$ has been set. */\n" |
+ "/// Test to see if @c $name$ has been set.\n" |
"@property(nonatomic, readwrite) BOOL has$capitalized_name$$deprecated_attribute$;\n"); |
} |
if (IsInitName(variables_.find("name")->second)) { |
@@ -387,7 +387,7 @@ void RepeatedFieldGenerator::GeneratePropertyDeclaration( |
"$comments$" |
"$array_comment$" |
"@property(nonatomic, readwrite, strong, null_resettable) $array_property_type$ *$name$$storage_attribute$$deprecated_attribute$;\n" |
- "/** The number of items in @c $name$ without causing the array to be created. */\n" |
+ "/// The number of items in @c $name$ without causing the array to be created.\n" |
"@property(nonatomic, readonly) NSUInteger $name$_Count$deprecated_attribute$;\n"); |
if (IsInitName(variables_.find("name")->second)) { |
// If property name starts with init we need to annotate it to get past ARC. |