amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-04-28 10:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
4917e7c259fe0528d61b8dec53332ad6691c8510
json/include/nlohmann/detail
History
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
..
conversions
Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics
2021-02-07 17:45:09 +01:00
input
Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics
2021-02-07 17:45:09 +01:00
iterators
Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics
2021-02-07 17:45:09 +01:00
meta
🚨 fix warnings
2020-12-26 17:56:16 +01:00
output
♻️ remove diagnostics_t class
2021-01-25 13:47:50 +01:00
exceptions.hpp
👌 remove unused template parameter
2021-01-26 17:49:15 +01:00
hash.hpp
🚨 fix warnings
2020-12-26 17:56:16 +01:00
json_pointer.hpp
♻️ remove diagnostics_t class
2021-01-25 13:47:50 +01:00
json_ref.hpp
🎨 amalgamate code
2020-12-14 10:38:49 +01:00
macro_scope.hpp
♻️ remove "#define private public"
2020-08-12 13:30:06 +02:00
macro_unscope.hpp
♻️ remove "#define private public"
2020-08-12 13:30:06 +02:00
string_escape.hpp
🐛 proper JSON Pointer escape in diagnostic messages
2021-01-16 15:33:05 +01:00
value_t.hpp
🚨 fix warnings
2021-01-10 13:39:36 +01:00