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

Compat fixes #2600

Merged
merged 3 commits into from Apr 28, 2017

Conversation

Projects
None yet
1 participant
@hkaiser
Copy link
Member

commented Apr 25, 2017

@biddisco I added you as a potential reviewer as we don't know whether Boost.Log requires linking with Boost.Thread (which might be disabled now).

@hkaiser hkaiser added this to the 1.1.0 milestone Apr 25, 2017

@hkaiser hkaiser requested review from biddisco and K-ballo Apr 25, 2017

@hkaiser

This comment has been minimized.

Copy link
Member Author

commented Apr 25, 2017

[08:40] K-ballo: hkaiser: what's HPX_BOOST_LOG_LIBS? that's not Boost.Log, is it?
[08:40] hkaiser: K-ballo: jbjnr is using the actual boost.log in a parcelport
[08:41] K-ballo: that might need to link against boost.thread too
[08:43] hkaiser: K-ballo: ok, I'll add jbjnr to the list of potential reviewers for the PR
[08:43] K-ballo: the || !defined(HPX_HAVE_CXX11_STD_THREAD) bits should not be needed
[08:44] K-ballo: I put that fallback somewhere in the cmake files
[08:47] K-ballo: https://github.com/STEllAR-GROUP/hpx/blob/master/CMakeLists.txt#L1039-L1049
[08:48] K-ballo: hkaiser: my intention was that lack of std::thread should be a configuration error that forces the user to activate compatibility, but I don't think that's what I did
[08:49] K-ballo: in any case, it could mention compatibility in the error message
[08:49] hkaiser: I'll add that
[08:54] Notice from github: [hpx] hkaiser pushed 1 new commit to compat_fixes: https://git.io/v9qgq
[08:54] Notice from github: hpx/compat_fixes 4cdde0e Hartmut Kaiser: Do not implicitly fall back to thread compatibility
[08:54] hkaiser: K-ballo: how about this ^^
[08:55] K-ballo: looks good

@hkaiser hkaiser force-pushed the compat_fixes branch from 4cdde0e to 8947b45 Apr 25, 2017

hkaiser added some commits Apr 25, 2017

Minor changes/additions to compatibility layer:
- adding new header files to solution
- better message for compatibility mode for threads if std::thread is not available
- excluding Boost.Thread and Boost.Chrono from setup_boost if those are not needed

@hkaiser hkaiser force-pushed the compat_fixes branch from 3056715 to df9c7b9 Apr 27, 2017

@hkaiser hkaiser force-pushed the compat_fixes branch from df9c7b9 to a8deb9f Apr 27, 2017

@hkaiser hkaiser merged commit 714601a into master Apr 28, 2017

1 check passed

ci/circleci Your tests passed on CircleCI!
Details

@hkaiser hkaiser deleted the compat_fixes branch Apr 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.