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

🏁 do not include <ciso646> unless old MSVC is used #2089

Browse source
This commit is contained in:
Niels Lohmann 2020-05-07 09:43:41 +02:00
parent a50a14088c
commit 9adb1c0235
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
11 changed files with 87 additions and 52 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>

3
include/nlohmann/detail/conversions/to_chars.hpp
View file

@ -2,12 +2,13 @@
#include <array> // array
#include <cassert> // assert
#include <ciso646> // or, and, not
#include <cmath> // signbit, isfinite
#include <cstdint> // intN_t, uintN_t
#include <cstring> // memcpy, memmove
#include <limits> // numeric_limits
#include <type_traits> // conditional
#include <nlohmann/detail/boolean_operators.hpp>
#include <nlohmann/detail/macro_scope.hpp>
namespace nlohmann

2
include/nlohmann/detail/conversions/to_json.hpp
View file

@ -1,7 +1,6 @@
#pragma once
#include <algorithm> // copy
#include <ciso646> // or, and, not
#include <iterator> // begin, end
#include <string> // string
#include <tuple> // tuple, get
@ -10,6 +9,7 @@
#include <valarray> // valarray
#include <vector> // vector
#include <nlohmann/detail/boolean_operators.hpp>
#include <nlohmann/detail/iterators/iteration_proxy.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/type_traits.hpp>