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.

Sign up for GitHub

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

Jump to bottom

Fix mutual exclusivity #86

Merged
merged 1 commit into from Sep 19, 2015
Merged

Fix mutual exclusivity #86

merged 1 commit into from Sep 19, 2015

Conversation

mblsha
Copy link
Contributor

@mblsha mblsha commented Sep 19, 2015

Fixes #62.

@mblsha mblsha mentioned this pull request Sep 19, 2015
Closed
@mblsha
Copy link
Contributor Author

mblsha commented Sep 19, 2015

I added Xtrace.h / Xtrace.mm to the project, and then in the test I did op.xtrace(), and compared the trace from the good run with the one from the bad timeout run. The culprit was additional unwanted dependency. Advanced NSOperations's code was correct in this regard, so it was probably a typo.

@danthorpe
Copy link
Member

Yep, regression introduced in c829626, okay merging now. Will do a 2.0.1 release. And will also cherry pick into a 1.0.1 release. Really not sure if people are still stuck on Swift 1.2 or not.

Great find @mblsha thanks so much!

danthorpe added a commit that referenced this pull request Sep 19, 2015
@danthorpe
Merge pull request #86 from mblsha/development
5a2b2e6 
Fix mutual exclusivity
@danthorpe danthorpe merged commit 5a2b2e6 into ProcedureKit:development Sep 19, 2015
@danthorpe
Copy link
Member

Except it's not a bug in 1.0, so just 2.0.1 then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mblsha @danthorpe