diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-08-17 16:11:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-17 16:11:53 -0400 |
commit | 564c02f5cb86065cdb5be05ab84f419d1324384e (patch) | |
tree | b5848d3662e0d8649c0614caeaa210b285daae5f /src/google/protobuf/compiler/objectivec/objectivec_file.cc | |
parent | cf42b608e050260a0ef41a69d930e4a50a69560d (diff) | |
parent | a877fdfafe3451d0d1a12bfcb270911bbe0ddfcd (diff) | |
download | protobuf-564c02f5cb86065cdb5be05ab84f419d1324384e.tar.gz protobuf-564c02f5cb86065cdb5be05ab84f419d1324384e.tar.bz2 protobuf-564c02f5cb86065cdb5be05ab84f419d1324384e.zip |
Merge pull request #1975 from pherl/cp
Cherry pick objc changes into 3.0.0-GA branch
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_file.cc')
-rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_file.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_file.cc b/src/google/protobuf/compiler/objectivec/objectivec_file.cc index b864ef12..438f4113 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_file.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_file.cc @@ -357,14 +357,16 @@ void FileGenerator::GenerateHeader(io::Printer *printer) { printer->Print( "#pragma mark - $root_class_name$\n" "\n" - "/// Exposes the extension registry for this file.\n" - "///\n" - "/// The base class provides:\n" - "/// @code\n" - "/// + (GPBExtensionRegistry *)extensionRegistry;\n" - "/// @endcode\n" - "/// which is a @c GPBExtensionRegistry that includes all the extensions defined by\n" - "/// this file and all files that it depends on.\n" + "/**\n" + " * Exposes the extension registry for this file.\n" + " *\n" + " * The base class provides:\n" + " * @code\n" + " * + (GPBExtensionRegistry *)extensionRegistry;\n" + " * @endcode\n" + " * which is a @c GPBExtensionRegistry that includes all the extensions defined by\n" + " * this file and all files that it depends on.\n" + " **/\n" "@interface $root_class_name$ : GPBRootObject\n" "@end\n" "\n", |