Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update code to work for Xcode 10b1 #4729

Merged
merged 2 commits into from Jun 5, 2018
Merged

Update code to work for Xcode 10b1 #4729

merged 2 commits into from Jun 5, 2018

Conversation

sergiocampama
Copy link
Contributor

No description provided.

@@ -2537,12 +2537,12 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
return [_array countByEnumeratingWithState:state objects:buffer count:len];
}

- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block {
- (void)enumerateObjectsUsingBlock:(void (NS_NOESCAPE ^)(id obj, NSUInteger idx, BOOL *stop))block {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update objectivec/README.md, i believe it says we just require Xcode 7.0, so this likely needs to be raised.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, also updated the script

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, don't we also want the NO_ESCAPE in the header also so code calling this is correct?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And no we don't since these are just the hooked cases. We probably should add NOESCAPE to the GPB ones, but that can happen later.

@thomasvl thomasvl self-assigned this Jun 5, 2018
@thomasvl thomasvl merged commit 6933e2f into protocolbuffers:master Jun 5, 2018
acozzette pushed a commit to acozzette/protobuf that referenced this pull request Jun 5, 2018
* Update code to work for Xcode 10b

* Update README and test scripts to mention that Xcode 7 is no longer supported
shirl-resonai pushed a commit to resonai/protobuf that referenced this pull request Oct 14, 2018
* Update code to work for Xcode 10b

* Update README and test scripts to mention that Xcode 7 is no longer supported
shirl-resonai added a commit to resonai/protobuf that referenced this pull request Oct 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants