1
0
mirror of https://github.com/nlohmann/json synced 2024-11-21 19:50:04 +00:00
nlohmannjson/include/nlohmann
Fredrik Sandhei 060414037e
feat: Rebase feature/optional to develop (#4036)
* 🚧 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 <mail@nlohmann.me>
Co-authored-by: Markus Palonen <markus.palonen@gmail.com>
2024-11-16 17:19:33 +01:00
..
detail feat: Rebase feature/optional to develop (#4036) 2024-11-16 17:19:33 +01:00
thirdparty/hedley JSON for Modern C++ 3.11.3 (#4222) 2023-11-28 22:36:31 +01:00
adl_serializer.hpp JSON for Modern C++ 3.11.3 (#4222) 2023-11-28 22:36:31 +01:00
byte_container_with_subtype.hpp JSON for Modern C++ 3.11.3 (#4222) 2023-11-28 22:36:31 +01:00
json_fwd.hpp JSON for Modern C++ 3.11.3 (#4222) 2023-11-28 22:36:31 +01:00
json.hpp Another desperate try to fix the CI (#4489) 2024-11-13 10:21:26 +01:00
ordered_map.hpp JSON for Modern C++ 3.11.3 (#4222) 2023-11-28 22:36:31 +01:00