1
0
mirror of https://github.com/nlohmann/json synced 2025-01-07 08:00:05 +00:00
nlohmannjson/include/nlohmann/detail
Julian Becker 2a63869159 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson
Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	single_include/nlohmann/json.hpp
	src/unit-bson.cpp
2018-10-17 20:26:00 +02:00
..
conversions 🚨 fixed some clang-tidy warnings 2018-10-07 18:39:18 +02:00
input Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson 2018-10-17 20:26:00 +02:00
iterators 🚨 fixed some clang-tidy warnings 2018-10-07 18:39:18 +02:00
meta 🚨 fixed some clang-tidy warnings 2018-10-07 18:39:18 +02:00
output Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson 2018-10-17 20:26:00 +02:00
exceptions.hpp Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson 2018-10-17 20:26:00 +02:00
json_pointer.hpp 🚨 fixed some clang-tidy warnings 2018-10-07 18:39:18 +02:00
json_ref.hpp add constraints for variadic json_ref constructors 2018-10-12 10:54:58 +02:00
macro_scope.hpp Patch nlohmann/json for GCC 4.8 2018-09-25 18:10:20 +02:00
macro_unscope.hpp use detected instead of has_* traits 2018-09-07 12:17:59 +02:00
value_t.hpp 🚨 fixed some clang-tidy warnings 2018-10-07 18:39:18 +02:00