diff options
author | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
commit | 0ba8eea655a5e40d19ab95c773192b5d908c5a61 (patch) | |
tree | 4c2c97ade1ab197d361c146bacae5adde55986bf /objectivec/GPBUtilities_PackagePrivate.h | |
parent | 92a7e778e7394386f413cec28d67a07630f784b1 (diff) | |
parent | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (diff) | |
download | protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.tar.gz protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.tar.bz2 protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.zip |
Merge branch 'master' into down-integrate
Diffstat (limited to 'objectivec/GPBUtilities_PackagePrivate.h')
-rw-r--r-- | objectivec/GPBUtilities_PackagePrivate.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/objectivec/GPBUtilities_PackagePrivate.h b/objectivec/GPBUtilities_PackagePrivate.h index 16859d48..c8b21ed7 100644 --- a/objectivec/GPBUtilities_PackagePrivate.h +++ b/objectivec/GPBUtilities_PackagePrivate.h @@ -309,7 +309,8 @@ NSString *GPBDecodeTextFormatName(const uint8_t *decodeData, int32_t key, // A series of selectors that are used solely to get @encoding values // for them by the dynamic protobuf runtime code. See -// GPBMessageEncodingForSelector for details. +// GPBMessageEncodingForSelector for details. GPBRootObject conforms to +// the protocol so that it is encoded in the Objective C runtime. @protocol GPBMessageSignatureProtocol @optional |