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

Merge pull request #2115 from nlohmann/issue2089

Browse source 
Do not include <ciso646> when using C++17
This commit is contained in:
Niels Lohmann 2020-05-17 12:17:17 +02:00 • committed by GitHub
commit 6154d50a9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 49 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/detail/output/serializer.hpp
View file

@ -3,7 +3,6 @@
#include <algorithm> // reverse, remove, fill, find, none_of
#include <array> // array
#include <cassert> // assert
#include <ciso646> // and, or
#include <clocale> // localeconv, lconv
#include <cmath> // labs, isfinite, isnan, signbit
#include <cstddef> // size_t, ptrdiff_t
@ -14,6 +13,7 @@
#include <type_traits> // is_same
#include <utility> // move
#include <nlohmann/detail/boolean_operators.hpp>
#include <nlohmann/detail/conversions/to_chars.hpp>
#include <nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/macro_scope.hpp>