Niels Lohmann 4917e7c259 Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics ...

 Conflicts:

	include/nlohmann/detail/input/parser.hpp

	single_include/nlohmann/json.hpp

2021-02-07 17:45:09 +01:00

..

internal_iterator.hpp

🚨 remove warnings

2020-06-22 22:32:21 +02:00

iter_impl.hpp

♻️ remove diagnostics_t class

2021-01-25 13:47:50 +01:00

iteration_proxy.hpp

🚨 fix warning

2021-01-30 12:51:54 +01:00

iterator_traits.hpp

🎨 replace alternative operators (and, not, or)

2020-06-03 14:20:36 +02:00

json_reverse_iterator.hpp

🚨 fixed some clang-tidy warnings

2018-10-07 18:39:18 +02:00

primitive_iterator.hpp

🚨 fix warnings

2020-12-26 17:56:16 +01:00