sclang: changed some boost code to std #2091
Merged
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
Because MSVC does not support some C++11 constructs that boost is using. Note that we can probably streamline the code with some MACROs or something, but I want to make it very explicit for now, to help with the PR discussion.
Merged
|
thanks for looking into this! it looks pretty good, just two comments:
|
| columnDescriptorsWithStats.push_back( std::move(future) ); | ||
| } | ||
|
|
||
| calcRowStats(bigTable, filledSelectors, numClasses, numSelectors, 0, std::min( selectorsPerJob, numSelectors) ); | ||
|
|
||
| for( auto & future : columnDescriptorsWithStats ) { | ||
| #ifdef _MSC_VER | ||
| future.wait(); |
There was a problem hiding this comment.
please try not to mix tabs and spaces.
There was a problem hiding this comment.
Ok, I will change the async to deferred.
Sorry about the space, I will fix that too, of course.
columnDescriptorsWithStats.push_back( std::move(future) ); } calcRowStats(bigTable, filledSelectors, numClasses, numSelectors, 0, std::min( selectorsPerJob, numSelectors) ); for( auto & future : columnDescriptorsWithStats ) {+#ifdef MSC
And fix a whitespace issue.
|
Master now builds fine with VS 2013 with both boost 1.60 and 1.61. It think maybe after @timblechmann gave a lgtm this should go in as quickly as possible. |
|
Windows fully back on master, yey! Thanks @llloret ! |
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.
This is to have windows MSVC compile on master again.
Because MSVC does not support some C++11 constructs that boost is using.
Note that we can probably streamline the code with some MACROs or
something, but I want to make it very explicit for now, to help with the
PR discussion.