-
-
Notifications
You must be signed in to change notification settings - Fork 7.4k
Fix missing exports from json.cppm
#5137
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b471653
Fix missing exports from `json.cppm`
mikomikotaishi 507b346
Update documentation to describe what symbols are exported
mikomikotaishi e35f566
Add mention of `std` symbols
mikomikotaishi 79c7fc9
Add `json_literals` inline namespace to `using` statement
mikomikotaishi 026df83
Remove internals (`nlohmann::detail::*`) from module
mikomikotaishi 244d5b3
Omit internals (`nlohmann::detail::*`) from modules documentation
mikomikotaishi c639b51
Restore `nlohmann::detail` symbols with mention of the MSVC bug
mikomikotaishi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,48 @@ | ||
| // __ _____ _____ _____ | ||
| // __| | __| | | | JSON for Modern C++ | ||
| // | | |__ | | | | | | version 3.12.0 | ||
| // |_____|_____|_____|_|___| https://github.com/nlohmann/json | ||
| // | ||
| // SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me> | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| module; | ||
|
|
||
| #include <nlohmann/json.hpp> | ||
|
|
||
| export module nlohmann.json; | ||
|
|
||
| export namespace nlohmann { | ||
| using ::nlohmann::adl_serializer; | ||
| using ::nlohmann::basic_json; | ||
| using ::nlohmann::json; | ||
| using ::nlohmann::json_pointer; | ||
| using ::nlohmann::ordered_json; | ||
| using ::nlohmann::ordered_map; | ||
| } // namespace nlohmann | ||
|
|
||
| export | ||
| NLOHMANN_JSON_NAMESPACE_BEGIN | ||
|
|
||
| using NLOHMANN_JSON_NAMESPACE::adl_serializer; | ||
| using NLOHMANN_JSON_NAMESPACE::basic_json; | ||
| using NLOHMANN_JSON_NAMESPACE::json; | ||
| using NLOHMANN_JSON_NAMESPACE::json_pointer; | ||
| using NLOHMANN_JSON_NAMESPACE::ordered_json; | ||
| using NLOHMANN_JSON_NAMESPACE::ordered_map; | ||
| using NLOHMANN_JSON_NAMESPACE::to_string; | ||
|
|
||
| inline namespace literals | ||
| { | ||
| inline namespace json_literals | ||
| { | ||
| using NLOHMANN_JSON_NAMESPACE::literals::json_literals::operator""_json; | ||
| using NLOHMANN_JSON_NAMESPACE::literals::json_literals::operator""_json_pointer; | ||
| } // namespace json_literals | ||
| } // namespace literals | ||
|
|
||
| namespace detail | ||
| { | ||
| export using NLOHMANN_JSON_NAMESPACE::detail::json_sax_dom_callback_parser; | ||
| export using NLOHMANN_JSON_NAMESPACE::detail::unknown_size; | ||
| using NLOHMANN_JSON_NAMESPACE::detail::json_sax_dom_callback_parser; | ||
| using NLOHMANN_JSON_NAMESPACE::detail::unknown_size; | ||
| } // namespace detail | ||
|
|
||
| export using NLOHMANN_JSON_NAMESPACE::adl_serializer; | ||
| export using NLOHMANN_JSON_NAMESPACE::basic_json; | ||
| export using NLOHMANN_JSON_NAMESPACE::json; | ||
| export using NLOHMANN_JSON_NAMESPACE::json_pointer; | ||
| export using NLOHMANN_JSON_NAMESPACE::ordered_json; | ||
| export using NLOHMANN_JSON_NAMESPACE::ordered_map; | ||
| export using NLOHMANN_JSON_NAMESPACE::to_string; | ||
|
|
||
| NLOHMANN_JSON_NAMESPACE_END | ||
|
|
||
| export namespace std | ||
| { | ||
| using std::hash; | ||
| using std::less; | ||
| using std::swap; | ||
| } // namespace std |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.