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

Replace boost::reverse_lock with our own #6630

Merged
merged 1 commit into from Sep 3, 2015
Merged

Conversation

@casey
Copy link
Contributor

casey commented Sep 3, 2015

See #6608 for discussion.

This removes boost::reverse_lock so that we don't depend on boost 1.50, and replaces it with our own implementation.

This implementation is stricter than boost::reverse_lock. Reverse locking an unlocked lock, and re-locking a lock while a reverse_lock is active are both errors.

@sipa
Copy link
Member

sipa commented Sep 3, 2015

ACK if Travis is happy.

@casey
Copy link
Contributor Author

casey commented Sep 3, 2015

Travis is unhappy; I think I neglected to add the new file to the makefile. Fixing it now.

@paveljanik
Copy link
Contributor

paveljanik commented Sep 3, 2015

ACK after minor nits.

@laanwj
laanwj reviewed Sep 3, 2015
View changes
src/reverselock.h Outdated
reverse_lock& operator=(reverse_lock const&);

Lock& lock;
//mutex_type* mutex;

This comment has been minimized.

Copy link
@laanwj

laanwj Sep 3, 2015

Member

Redundant commented line

This comment has been minimized.

Copy link
@casey

casey Sep 3, 2015

Author Contributor

Removed

@laanwj
Copy link
Member

laanwj commented Sep 3, 2015

utACK, thanks for adding tests!

@gavinandresen
Copy link
Contributor

gavinandresen commented Sep 3, 2015

ACK, works nicely on my OSX machine.

@laanwj laanwj merged commit 86270c8 into bitcoin:master Sep 3, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Sep 3, 2015
86270c8 Replace boost::reverse_lock with our own. (Casey Rodarmor)
@dcousens
Copy link
Contributor

dcousens commented Sep 3, 2015

Great work @casey 👍 , utACK

@jonasschnelli
Copy link
Member

jonasschnelli commented Sep 4, 2015

PostMerge ACK.
@casey: Nice work!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.