lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-31 10:24:23 +03:00
Code 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
parent f40a9f876a 8c2b26de4a
commit 6154d50a9f
11 changed files with 49 additions and 18 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>