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

3
include/nlohmann/detail/meta/cpp_future.hpp
View file

@ -1,9 +1,10 @@
#pragma once
#include <ciso646> // not
#include <cstddef> // size_t
#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
#include <nlohmann/detail/boolean_operators.hpp>
namespace nlohmann
{
namespace detail

2
include/nlohmann/detail/meta/type_traits.hpp
View file

@ -1,10 +1,10 @@
#pragma once
#include <ciso646> // not
#include <limits> // numeric_limits
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <utility> // declval
#include <nlohmann/detail/boolean_operators.hpp>
#include <nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp>