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/detail/conversions/from_json.hpp
View file

@ -2,7 +2,6 @@
#include <algorithm> // transform
#include <array> // array
#include <ciso646> // and, not
#include <forward_list> // forward_list
#include <iterator> // inserter, front_inserter, end
#include <map> // map
@ -13,6 +12,7 @@
#include <utility> // pair, declval
#include <valarray> // valarray
#include <nlohmann/detail/boolean_operators.hpp>
#include <nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp>