Internal change

PiperOrigin-RevId: 599669392
pull/15497/head
Protobuf Team Bot 10 months ago committed by Copybara-Service
parent 65a353fa10
commit 7d508b41df
  1. 8
      objectivec/GPBMessage.m
  2. 4
      objectivec/GPBUtilities.m
  3. 3
      objectivec/Tests/GPBConcurrencyTests.m

@ -2378,7 +2378,7 @@ static void MergeRepeatedPackedFieldFromCodedInputStream(GPBMessage *self,
break;
}
} // switch
} // while(BytesUntilLimit() > 0)
} // while(BytesUntilLimit() > 0)
GPBCodedInputStreamPopLimit(state, limit);
}
@ -2657,7 +2657,7 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
}
}
} // if (fieldType)..else if...else
} // for(fields)
} // for(fields)
// Unknown fields.
if (!unknownFields_) {
@ -2825,8 +2825,8 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
break;
}
} // switch()
} // if(mapOrArray)...else
} // for(fields)
} // if(mapOrArray)...else
} // for(fields)
// nil and empty are equal
if (extensionMap_.count != 0 || otherMsg->extensionMap_.count != 0) {

@ -149,8 +149,8 @@ void GPBMessageDropUnknownFieldsRecursively(GPBMessage *initialMessage) {
}
break;
} // switch(field.mapKeyDataType)
} // switch(field.fieldType)
} // for(fields)
} // switch(field.fieldType)
} // for(fields)
// Handle any extensions holding messages.
for (GPBExtensionDescriptor *extension in [msg extensionsCurrentlySet]) {

@ -49,8 +49,7 @@ static const int kNumMessages = 100;
- (void)joinThreads:(NSArray *)threads {
for (NSThread *thread in threads) {
while (![thread isFinished])
;
while (![thread isFinished]);
}
}

Loading…
Cancel
Save