Fixed basic_json::diff and basic_json::patch not compiling with custom string type (#4134)#4137
Fixed basic_json::diff and basic_json::patch not compiling with custom string type (#4134)#4137tomalakgeretkal wants to merge 3 commits intonlohmann:developfrom
Conversation
|
|
||
| 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
left a comment
nlohmann
left a comment
There was a problem hiding this comment.
Please update from the develop branch as it has a working CI now.
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. |
|
This pull request has been marked as stale because it has had no activity for 30 days. While we won’t close it automatically, we encourage you to update or comment if it is still relevant. Keeping pull requests active and up-to-date helps us review and merge changes more efficiently. Thank you for your contributions! |
github-actions
bot
added
the
state: stale
4 participants
Note that this has yet to be amalgamated (waiting for #4083).