j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type

Browse source
This commit is contained in:
Niels Lohmann 2020-05-17 12:27:58 +02:00
commit ab6e76dd05
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
18 changed files with 96 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/json.hpp
View file

@ -36,7 +36,6 @@ SOFTWARE.
#include <algorithm> // all_of, find, for_each
#include <cassert> // assert
#include <ciso646> // and, not, or
#include <cstddef> // nullptr_t, ptrdiff_t, size_t
#include <functional> // hash, less
#include <initializer_list> // initializer_list
@ -49,6 +48,7 @@ SOFTWARE.
#include <vector> // vector
#include <nlohmann/adl_serializer.hpp>
#include <nlohmann/detail/boolean_operators.hpp>
#include <nlohmann/detail/conversions/from_json.hpp>
#include <nlohmann/detail/conversions/to_json.hpp>
#include <nlohmann/detail/exceptions.hpp>