Fixed basic_json::diff and basic_json::patch not compiling with custom string type (#4134) #4137
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
tomalakgeretkal
commented
Sep 6, 2023
| @@ -36,10 +36,33 @@ class alt_string | |||
| alt_string(size_t count, char chr): str_impl(count, chr) {} | |||
| alt_string() = default; | |||
|
|
|||
| template <typename...TParams> | |||
| alt_string& append(TParams&& ...params) | |||
| alt_string& append(std::size_t count, char ch) | |||
There was a problem hiding this comment.
The template version broke SFINAE-driven feature-detection in detail/string_concat.hpp.
tomalakgeretkal
force-pushed
the
custom-string-fix
branch
from
a410d07
to
51c6652
Compare
|
Amalgamated. |
nlohmann
requested changes
Sep 24, 2023
tomalakgeretkal
force-pushed
the
custom-string-fix
branch
from
4cd9a52
to
f4b7b90
Compare
tomalakgeretkal
force-pushed
the
custom-string-fix
branch
from
f4b7b90
to
77ec6e4
Compare
tomalakgeretkal
force-pushed
the
custom-string-fix
branch
from
77ec6e4
to
96129bd
Compare
🔴 Amalgamation check failed! 🔴The source code has not been amalgamated. @tomalakgeretkal |
|
Looks amalgamated here :( check-amalgamate works for me! |
|
You may be using a different version of astyle that produces different results. The check is using 3.1. We've seen that later versions produce different results. |
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.
Note that this has yet to be amalgamated (waiting for #4083).