Create comparator wrapper classes for MSVC 2019 build issues: #3786
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
scottschurr
reviewed
Mar 8, 2021
src/test/csf/ledgers.h
Outdated
| @@ -21,6 +21,7 @@ | |||
|
|
|||
| #include <ripple/basics/UnorderedContainers.h> | |||
| #include <ripple/basics/chrono.h> | |||
| #include <ripple/basics/comparitors.h> | |||
There was a problem hiding this comment.
I think this is misspelled? "comparators.h"?
|
Also, the commit message misspells "comparators" I think. That would be good to fix. |
🤦♂️ Will fix. |
|
I fixed the typo in a |
|
👍 Looks great! |
scottschurr
approved these changes
Mar 17, 2021
nbougalis
added
the
Ready to merge
intelliot
changed the title
src/ripple/basics/comparators.h
Outdated
| //------------------------------------------------------------------------------ | ||
| /* | ||
| This file is part of rippled: https://github.com/ripple/rippled | ||
| Copyright (c) 2012, 2013 Ripple Labs Inc. |
There was a problem hiding this comment.
Copyright (c) 2021 Ripple Labs Inc.
src/ripple/basics/comparators.h
Outdated
|
|
||
| } // namespace ripple | ||
|
|
||
| #endif |
There was a problem hiding this comment.
Missing carriage return
* The std::less and std::equal_to comparators have [[nodiscard]], which conflicts with boost::bimap validations.
|
Squashed and rebased onto 1.8.0-b1 |
This was referenced Mar 31, 2021
Closed
Closed
Merged
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.
High Level Overview of Change
Travis CI builds started failing for Visual Studio 2019 builds. Example 1, example 2.
@scottschurr , @miguelportilla , and I tracked the problem down to a recent update to VS 2019. The unaltered current develop branch fails with this version, so it is definitely not due to changes in rippled code.
The underlying cause is that the
std::lessandstd::equal_tocomparators have added the[[nodiscard]]attribute, which conflicts withboost::bimaptype validations, which call the functions without capturing the result.This fix adds classes to exactly wrap the comparators, removing
[[nodiscard]]attributes.Type of Change
Future Tasks
The new wrapper classes can be removed when either:
This change is