|
|
|
@ -241,21 +241,6 @@ CF_EXTERN_C_END |
|
|
|
|
(nullable id<GPBExtensionRegistry>)extensionRegistry |
|
|
|
|
error:(NSError **)errorPtr; |
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Parses the given data as this message's class, and merges those values into |
|
|
|
|
* this message. |
|
|
|
|
* |
|
|
|
|
* @param data The binary representation of the message to merge. |
|
|
|
|
* @param extensionRegistry The extension registry to use to look up extensions. |
|
|
|
|
* |
|
|
|
|
* @exception GPBCodedInputStreamException Exception thrown when parsing was |
|
|
|
|
* unsuccessful. |
|
|
|
|
**/ |
|
|
|
|
- (void)mergeFromData:(NSData *)data |
|
|
|
|
extensionRegistry:(nullable id<GPBExtensionRegistry>)extensionRegistry |
|
|
|
|
__attribute__((deprecated( |
|
|
|
|
"Use -mergeFromData:extensionRegistry:error: instead, especaily if calling from Swift."))); |
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Parses the given data as this message's class, and merges those values into |
|
|
|
|
* this message. |
|
|
|
|