|
@@ -2591,13 +2591,14 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
|
|
if (other == self) {
|
|
if (other == self) {
|
|
return YES;
|
|
return YES;
|
|
}
|
|
}
|
|
- if (![other isKindOfClass:[self class]] &&
|
|
|
|
- ![self isKindOfClass:[other class]]) {
|
|
|
|
|
|
+ if (![other isKindOfClass:[GPBMessage class]]) {
|
|
return NO;
|
|
return NO;
|
|
}
|
|
}
|
|
-
|
|
|
|
GPBMessage *otherMsg = other;
|
|
GPBMessage *otherMsg = other;
|
|
GPBDescriptor *descriptor = [[self class] descriptor];
|
|
GPBDescriptor *descriptor = [[self class] descriptor];
|
|
|
|
+ if ([[otherMsg class] descriptor] != descriptor) {
|
|
|
|
+ return NO;
|
|
|
|
+ }
|
|
uint8_t *selfStorage = (uint8_t *)messageStorage_;
|
|
uint8_t *selfStorage = (uint8_t *)messageStorage_;
|
|
uint8_t *otherStorage = (uint8_t *)otherMsg->messageStorage_;
|
|
uint8_t *otherStorage = (uint8_t *)otherMsg->messageStorage_;
|
|
|
|
|