Skip to content

Conversation

@chelseadzdr
Copy link

Changes made

  • pulled pr optional: use #if instead of #ifndef, fixes #3859 #4526 and amalgamated
  • merged into develop and fixed conflicts, kept most recent version of from_json.hpp (removed extra JSON_USE_IMPLICIT_CONVERSIONS that broke C++11 builds).
  • Regenerated single-header files via the amalgamation target.

Existing issue is referenced:

How I tested

  • Windows: VS 2019, x64 toolset, CMake
    • -DJSON_BuildTests=ON
    • Built and ran tests (Debug/Release).

Amalgamation

  • The source code is amalgamated by running py -3 tools\amalgamate\amalgamate.py.

@gregmarr
Copy link
Contributor

I don't understand what's happening with this PR. It is not showing the change in the original file, but it is showing it in the amalgamated file, and there's no complaint about that from the checks. Also strange, there are only 5 checks.

@chelseadzdr
Copy link
Author

@gregmarr i think most workflows are awaiting approval because it is my first contribution, and the changes in the source files has been made in previous commits, the latest commits just amalgamated the headers, that's why at first it may look like only the amalgamated files are modified

@github-actions
Copy link

🔴 Amalgamation check failed! 🔴

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

@coveralls
Copy link

Coverage Status

coverage: 99.191%. remained the same
when pulling 4c55fcb on chelseadzdr:fix-msvc-optional
into 4f8ee1d on nlohmann:develop.

@github-actions
Copy link

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 Nov 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI L 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