Fix OSX build #2790
Merged
Fix OSX build #2790
Conversation
This file contains 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
Linker was complaining because of multiple definitions. The header was being included in multiple places, and they were each getting and exporting their own instance of the mutex.
|
In C++17 we could've just made it inline. But this looks fine, presuming that CI comes back green. |
| @@ -36,7 +36,6 @@ | |||
| #else | |||
| #include <hpx/lcos/local/spinlock.hpp> | |||
| #include <mutex> | |||
| hpx::lcos::local::spinlock gmtime_call_mutex; | |||
There was a problem hiding this comment.
In C++17 we could have just added inline here.
|
@brycelelbach: we try to stick to C++11 (for unguarded code), so this fix is correct. |
| @@ -105,7 +104,8 @@ template<class convert = do_convert_format::prepend> struct high_precision_time_ | |||
| // fall back to non-thread-safe version on other platforms | |||
| std::tm local_tm; | |||
| { | |||
| std::unique_lock<hpx::lcos::local::spinlock> ul(gmtime_call_mutex); | |||
| static hpx::lcos::local::spinlock mutex; | |||
| std::unique_lock<hpx::lcos::local::spinlock> ul(mutex); | |||
There was a problem hiding this comment.
This looks fine; note that this code is surrounded in the same #ifdef/#endif block as the above diff, although the #ifdef/#endif aren't visible in this patch..
brycelelbach
approved these changes
Jul 31, 2017
|
@hkaiser: I know :). Just mentioning it. |
|
Hrm, why is the AppVeyor build failing? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Linker was complaining because of multiple definitions. The header was being included in multiple places, and they were each getting and exporting their own instance of the mutex.
This was broken in 0d9d74d