Fix scheduler build with some boost versions.#6285
Merged
laanwj merged 1 commit intobitcoin:masterfrom Jun 16, 2015
Merged
Conversation
Contributor
|
utACK. |
Some boost versions have a conflicting overload of wait_until that returns void. Explicitly use a template here to avoid hitting that overload.
0116e92 to
72bf90d
Compare
Member
Author
|
Grr, that overload was only present for pthreads. Updated to provide no params, only hint at template usage. |
Member
|
utACK, thanks! |
laanwj
added a commit
that referenced
this pull request
Jun 16, 2015
72bf90d Fix scheduler build with some boost versions. (Cory Fields)
Member
|
Cherry-picked to 0.11 as ef1d506 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Some boost versions have a conflicting public overload of wait_until that returns void. Explicitly use a template here to avoid hitting that overload.
Tested against boost 1.52, which is confirmed broken -> fixed.
For reference, here are the competing overloads (from thread/pthread/condition_variable_fwd.hpp):
boost::chrono::system_clock::durationis typedef'd as chrono::nanoseconds, so without template params we end up falling into the void-return overload.