Internal change

PiperOrigin-RevId: 599669392
pull/15497/head
Protobuf Team Bot 1 year 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; break;
} }
} // switch } // switch
} // while(BytesUntilLimit() > 0) } // while(BytesUntilLimit() > 0)
GPBCodedInputStreamPopLimit(state, limit); GPBCodedInputStreamPopLimit(state, limit);
} }
@ -2657,7 +2657,7 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
} }
} }
} // if (fieldType)..else if...else } // if (fieldType)..else if...else
} // for(fields) } // for(fields)
// Unknown fields. // Unknown fields.
if (!unknownFields_) { if (!unknownFields_) {
@ -2825,8 +2825,8 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
break; break;
} }
} // switch() } // switch()
} // if(mapOrArray)...else } // if(mapOrArray)...else
} // for(fields) } // for(fields)
// nil and empty are equal // nil and empty are equal
if (extensionMap_.count != 0 || otherMsg->extensionMap_.count != 0) { if (extensionMap_.count != 0 || otherMsg->extensionMap_.count != 0) {

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

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

Loading…
Cancel
Save