diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-06-06 09:41:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-06 09:41:26 -0700 |
commit | 6ed0141c2e872dd5abbee2f9436ce7e65a1409b7 (patch) | |
tree | ca05210736f5396f02f49d046b0e01ea54a10f3d /objectivec/GPBDictionary.m | |
parent | 7e199b9e3501c2a34eeb28fd7eecde46086ad65f (diff) | |
parent | a3f31bf0e2b74a5b29cbde36ee0d45937f76fda6 (diff) | |
download | protobuf-6ed0141c2e872dd5abbee2f9436ce7e65a1409b7.tar.gz protobuf-6ed0141c2e872dd5abbee2f9436ce7e65a1409b7.tar.bz2 protobuf-6ed0141c2e872dd5abbee2f9436ce7e65a1409b7.zip |
Merge pull request #4730 from acozzette/xcode
Cherry-picked XCode 10 fixes into 3.6.x branch
Diffstat (limited to 'objectivec/GPBDictionary.m')
-rw-r--r-- | objectivec/GPBDictionary.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/GPBDictionary.m b/objectivec/GPBDictionary.m index aa21670a..cedf5e54 100644 --- a/objectivec/GPBDictionary.m +++ b/objectivec/GPBDictionary.m @@ -12102,14 +12102,14 @@ void GPBDictionaryReadEntry(id mapDictionary, } } -- (void)enumerateKeysAndObjectsUsingBlock:(void (^)(id key, +- (void)enumerateKeysAndObjectsUsingBlock:(void (NS_NOESCAPE ^)(id key, id obj, BOOL *stop))block { [_dictionary enumerateKeysAndObjectsUsingBlock:block]; } - (void)enumerateKeysAndObjectsWithOptions:(NSEnumerationOptions)opts - usingBlock:(void (^)(id key, + usingBlock:(void (NS_NOESCAPE ^)(id key, id obj, BOOL *stop))block { [_dictionary enumerateKeysAndObjectsWithOptions:opts usingBlock:block]; |