Niels Lohmann d15ad85203 Merge branch 'develop' of https://github.com/nlohmann/json into string_view ... Conflicts: include/nlohmann/detail/meta/type_traits.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp		2021-08-30 17:34:31 +02:00
..
cpp_future.hpp	📄 use code from Google Abseil	2021-03-24 13:27:00 +01:00
detected.hpp	Properly constrain the basic_json conversion operator	2021-07-19 11:16:27 -04:00
identity_tag.hpp	Reduced code duplication, renamed tag to identity_tag.	2021-01-10 19:23:32 +01:00
is_sax.hpp	🚸 add static assertion for missing binary function in SAX interface	2020-07-17 20:41:11 +02:00
type_traits.hpp	Merge branch 'develop' of https://github.com/nlohmann/json into string_view	2021-08-30 17:34:31 +02:00
void_t.hpp	🎨 replace alternative operators (and, not, or)	2020-06-03 14:20:36 +02:00