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

http: add Boost 1.49 compatibility #7065

Merged
merged 1 commit into from Nov 24, 2015

Conversation

@laanwj
Copy link
Member

laanwj commented Nov 20, 2015

I'm not sure what versions of Boost we reasonably support, anyway,

try_join_for was introduced in Boost 1.50: http://www.boost.org/doc/libs/1_50_0/doc/html/thread/thread_management.html#thread.thread_management.thread.try_join_for

1.49 has timed_join, one can accomplish the same with: http://www.boost.org/doc/libs/1_49_0/doc/html/thread/thread_management.html#thread.thread_management.thread.timed_join

However, timed_join was deprecated in 1.50. So a conditional is necessary.

This solution was tested in #7031.

`try_join_for` was introduced in Boost 1.50:
http://www.boost.org/doc/libs/1_50_0/doc/html/thread/thread_management.html#thread.thread_management.thread.try_join_for

1.49 has `timed_join`, one can accomplish the same with:
http://www.boost.org/doc/libs/1_49_0/doc/html/thread/thread_management.html#thread.thread_management.thread.timed_join

However, `timed_join` was deprecated in 1.50. So a conditional is
necessary.

This solution was tested in #7031.
@laanwj laanwj added the RPC/REST/ZMQ label Nov 20, 2015
@MarcoFalke
Copy link
Member

MarcoFalke commented Nov 20, 2015

utACK

@jonasschnelli
Copy link
Member

jonasschnelli commented Nov 20, 2015

Code Review ACK

@jmcorgan
Copy link
Contributor

jmcorgan commented Nov 20, 2015

utACK

@laanwj laanwj merged commit 3522f49 into bitcoin:master Nov 24, 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 Nov 24, 2015
3522f49 http: add Boost 1.49 compatibility (Wladimir J. van der Laan)
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

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