Niels Lohmann dc06f100be Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows ... Conflicts: include/nlohmann/detail/input/binary_reader.hpp include/nlohmann/detail/input/json_sax.hpp include/nlohmann/detail/input/lexer.hpp include/nlohmann/detail/input/parser.hpp include/nlohmann/detail/json_pointer.hpp include/nlohmann/detail/output/serializer.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp		2020-07-11 14:04:40 +02:00
..
conversions	Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows	2020-07-11 14:04:40 +02:00
input	Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows	2020-07-11 14:04:40 +02:00
iterators	Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows	2020-07-11 14:04:40 +02:00
meta	🎨 replace alternative operators (and, not, or)	2020-06-03 14:20:36 +02:00
output	Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows	2020-07-11 14:04:40 +02:00
boolean_operators.hpp	⚗️ do not include <ciso646> with C++20 #2089	2020-05-07 10:17:32 +02:00
exceptions.hpp	🚚 rename Hedley macros	2019-07-01 22:37:30 +02:00
json_pointer.hpp	Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows	2020-07-11 14:04:40 +02:00
json_ref.hpp	🚨 remove warnings	2020-06-22 22:32:21 +02:00
macro_scope.hpp	🚩 use JSON_ASSERT(x) instead of assert(x)	2020-07-06 12:22:31 +02:00
macro_unscope.hpp	🚩 use JSON_ASSERT(x) instead of assert(x)	2020-07-06 12:22:31 +02:00
value_t.hpp	🎨 replace alternative operators (and, not, or)	2020-06-03 14:20:36 +02:00