Skip to content

Fixed basic_json::diff and basic_json::patch not compiling with custom string type (#4134) - #4137

Closed
tomalakgeretkal wants to merge 3 commits into
nlohmann:developfrom
tomalakgeretkal:custom-string-fix
Closed

tomalakgeretkal wants to merge 3 commits into
nlohmann:developfrom
tomalakgeretkal:custom-string-fix

Conversation

@tomalakgeretkal

Copy link
Copy Markdown
Contributor

Note that this has yet to be amalgamated (waiting for #4083).


template <typename...TParams>
alt_string& append(TParams&& ...params)
alt_string& append(std::size_t count, char ch)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The template version broke SFINAE-driven feature-detection in detail/string_concat.hpp.

@tomalakgeretkal

Copy link
Copy Markdown
Contributor Author

Amalgamated.

@github-actions github-actions Bot added L and removed M labels Sep 8, 2023

@nlohmann nlohmann left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update from the develop branch as it has a working CI now.

@nlohmann nlohmann added the please rebase Please rebase your branch to origin/develop label Sep 24, 2023
@coveralls

coveralls commented Sep 25, 2023 •

Copy link
Copy Markdown

Coverage Status

coverage: 100.0%. remained the same when pulling 96129bd on tomalakgeretkal:custom-string-fix into edffad0 on nlohmann:develop.

@github-actions

Copy link
Copy Markdown

🔴 Amalgamation check failed! 🔴

The source code has not been amalgamated. @tomalakgeretkal
Please read and follow the Contribution Guidelines.

@tomalakgeretkal

Copy link
Copy Markdown
Contributor Author

Looks amalgamated here :( check-amalgamate works for me!

@gregmarr

Copy link
Copy Markdown
Contributor

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.

@github-actions

github-actions Bot commented Feb 1, 2025

Copy link
Copy Markdown

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 github-actions Bot added the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Feb 1, 2025
@nlohmann

Copy link
Copy Markdown
Owner

Thank you very much for this PR, @tomalakgeretkal, and for reporting #4134. The fix landed in #4536, which lets patch and diff work with arbitrary string types, and it is already on develop. I'm closing this PR as superseded. Thanks again!

This comment was written by Claude Code on behalf of @nlohmann.

@nlohmann nlohmann closed this Sep 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

L please rebase Please rebase your branch to origin/develop state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants