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

..

detail

Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics

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

thirdparty/hedley

🚨 fix warnings

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

adl_serializer.hpp

🎨 replace alternative operators (and, not, or)

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

byte_container_with_subtype.hpp

Change underscore placement

2020-12-11 13:43:17 +01:00

json_fwd.hpp

Fix compilation for xcode 9.x

2020-07-03 01:44:18 +01:00

json.hpp

♻️ remove diagnostics_t class

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

ordered_map.hpp

ordered_map::insert(InputIt first, InputIt last) is added

2020-12-07 20:15:41 +03:00