http: add Boost 1.49 compatibility #7065

Merged
merged 1 commit into from Nov 24, 2015

Conversation

Projects
None yet
4 participants
@laanwj
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.

http: add Boost 1.49 compatibility
`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

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Nov 20, 2015

Member

utACK

Member

MarcoFalke commented Nov 20, 2015

utACK

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Nov 20, 2015

Member

Code Review ACK

Member

jonasschnelli commented Nov 20, 2015

Code Review ACK

@jmcorgan

This comment has been minimized.

Show comment
Hide comment
@jmcorgan

jmcorgan Nov 20, 2015

Contributor

utACK

Contributor

jmcorgan commented Nov 20, 2015

utACK

@laanwj laanwj merged commit 3522f49 into bitcoin:master Nov 24, 2015

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

Merge pull request #7065
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