Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: third_party/protobuf/objectivec/GPBMessage_PackagePrivate.h

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/objectivec/GPBMessage.m ('k') | third_party/protobuf/objectivec/GPBProtocolBuffers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/objectivec/GPBMessage_PackagePrivate.h
diff --git a/third_party/protobuf/objectivec/GPBMessage_PackagePrivate.h b/third_party/protobuf/objectivec/GPBMessage_PackagePrivate.h
index 02d0e16e7a8018d4f29137f46204f140929c36dd..478db2cf0f96395915637ab862a0ec2f29a2bc1c 100644
--- a/third_party/protobuf/objectivec/GPBMessage_PackagePrivate.h
+++ b/third_party/protobuf/objectivec/GPBMessage_PackagePrivate.h
@@ -78,6 +78,10 @@ typedef struct GPBMessage_Storage *GPBMessage_StoragePtr;
// returns nil if the extension is not set)
- (id)getExistingExtension:(GPBExtensionDescriptor *)extension;
+// Returns an array of GPBExtensionDescriptor* for all the extensions currently
+// in use on the message. They are sorted by field number.
+- (NSArray *)sortedExtensionsInUse;
+
// Parses a message of this type from the input and merges it with this
// message.
//
@@ -106,12 +110,9 @@ CF_EXTERN_C_BEGIN
// Call this before using the readOnlySemaphore_. This ensures it is created only once.
NS_INLINE void GPBPrepareReadOnlySemaphore(GPBMessage *self) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
dispatch_once(&self->readOnlySemaphoreCreationOnce_, ^{
self->readOnlySemaphore_ = dispatch_semaphore_create(1);
});
-#pragma clang diagnostic pop
}
// Returns a new instance that was automatically created by |autocreator| for
« no previous file with comments | « third_party/protobuf/objectivec/GPBMessage.m ('k') | third_party/protobuf/objectivec/GPBProtocolBuffers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698