Replace boost::reverse_lock with our own #6630

Merged
merged 1 commit into from Sep 3, 2015

Conversation

Projects
None yet
7 participants
@casey
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

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Sep 3, 2015

Member

ACK if Travis is happy.

Member

sipa commented Sep 3, 2015

ACK if Travis is happy.

@casey

This comment has been minimized.

Show comment
Hide comment
@casey

casey Sep 3, 2015

Contributor

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

Contributor

casey commented Sep 3, 2015

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

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Sep 3, 2015

Contributor

ACK after minor nits.

Contributor

paveljanik commented Sep 3, 2015

ACK after minor nits.

@laanwj

View changes

src/reverselock.h
+ reverse_lock& operator=(reverse_lock const&);
+
+ Lock& lock;
+ //mutex_type* mutex;

This comment has been minimized.

@laanwj

laanwj Sep 3, 2015

Member

Redundant commented line

@laanwj

laanwj Sep 3, 2015

Member

Redundant commented line

This comment has been minimized.

@casey

casey Sep 3, 2015

Contributor

Removed

@casey

casey Sep 3, 2015

Contributor

Removed

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Sep 3, 2015

Member

utACK, thanks for adding tests!

Member

laanwj commented Sep 3, 2015

utACK, thanks for adding tests!

@gavinandresen

This comment has been minimized.

Show comment
Hide comment
@gavinandresen

gavinandresen Sep 3, 2015

Contributor

ACK, works nicely on my OSX machine.

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

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Sep 3, 2015

Merge pull request #6630
86270c8 Replace boost::reverse_lock with our own. (Casey Rodarmor)
@dcousens

This comment has been minimized.

Show comment
Hide comment
@dcousens

dcousens Sep 3, 2015

Contributor

Great work @casey 👍 , utACK

Contributor

dcousens commented Sep 3, 2015

Great work @casey 👍 , utACK

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Sep 4, 2015

Member

PostMerge ACK.
@casey: Nice work!

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