amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-04-14 03:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ac3922c7aa40aba1d326ab6ed0b908b499df5d7e
json/include/nlohmann/detail
History
Niels Lohmann ac3922c7aa Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
2020-06-27 13:14:48 +02:00
..
conversions
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00
input
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
2020-06-27 13:14:48 +02:00
iterators
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
2020-06-27 13:14:48 +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-06-27 13:14:48 +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-06-27 13:14:48 +02:00
json_ref.hpp
🚨 remove warnings
2020-06-22 22:32:21 +02:00
macro_scope.hpp
Disable std::swap specialization in C++20 and added a friend swap function
2020-06-06 11:36:39 -04:00
macro_unscope.hpp
🔨 add NLOHMANN_JSON prefix and undef macros
2019-07-01 22:24:39 +02:00
value_t.hpp
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00