-
-
Notifications
You must be signed in to change notification settings - Fork 6.9k
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
feat: Rebase feature/optional
to develop
#4036
Conversation
Changed the base branch to I'm sorry if I'm making it a bit difficult here; I forked the repository and rebased |
I am also interested in having |
0ad3ad6
to
d27adfd
Compare
See that clang-tidy is failing on some checks. Apparently this is on develop, too. I see that it is related to a supposed new check from clang-tidy v19: https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-designated-initializers.html. |
I'm on it. May take some more time. |
has this PR stalled again? |
I'm currently blocked by #4311. |
There has not been any activity in #4311 in a while. I wonder if this would be okay to merge? |
…SION is disabled.
1a8d427
to
4341bef
Compare
Thanks for keeping this alive. I will have a look at this on Saturday. |
Happy to help! Hopefully this can go in soon. |
Please suppress the last clang-tidy warning and not change the code. |
Reverted change with 296549c. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
Thanks! |
* 🚧 conversions for std::optional * 🏁 fix <optional> inclusion * 💚 overwork tests * Use JSON_HAS_CPP_17 only after it has been defined * ✅ update tests * 🏁 include right <optional> header * ♻️ do not include experimental headers * Add missing #endif after rebase * Fix failing test * Only define conversion to std::optional when JSON_USE_IMPLICIT_CONVERSION is disabled. * missing endif * Remove Wfloat-equal suppress * amalgamate * Move include of optional out of macro_scope; probably does not make sense to be there * Make clang-tidy happy * Suppress lint instead of changing to 'contains' --------- Co-authored-by: Niels Lohmann <[email protected]> Co-authored-by: Markus Palonen <[email protected]>
Rebasing
feature/optional
in attempt to revive this PR, referring to #2117.Sorry for long time between responses.
I may have been going forward with this the "wrong" way, so I apologize in advance.
Please let me know if this should be handled differently.
TODO
There is one test that is failing: Conversions from a default initialized
nlohmann::json
tostd::optional<T>
seems to fail. In the test case below, the last assertion fails with an exception. This is tested on Arch Linux with GCC 13.1.1.I was not able to figure out how to fix this so I need some assistance here.