Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
ae9bbbc9
Commit
ae9bbbc9
authored
May 31, 2021
by
David Pfahler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include io only if JSON_NO_IO is not set for #2728
parent
0a2de2f5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
input_adapters.hpp
include/nlohmann/detail/input/input_adapters.hpp
+5
-2
output_adapters.hpp
include/nlohmann/detail/output/output_adapters.hpp
+6
-2
json.hpp
include/nlohmann/json.hpp
+3
-1
No files found.
include/nlohmann/detail/input/input_adapters.hpp
View file @
ae9bbbc9
...
@@ -2,9 +2,7 @@
...
@@ -2,9 +2,7 @@
#include <array> // array
#include <array> // array
#include <cstddef> // size_t
#include <cstddef> // size_t
#include <cstdio> //FILE *
#include <cstring> // strlen
#include <cstring> // strlen
#include <istream> // istream
#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
#include <memory> // shared_ptr, make_shared, addressof
#include <memory> // shared_ptr, make_shared, addressof
#include <numeric> // accumulate
#include <numeric> // accumulate
...
@@ -12,6 +10,11 @@
...
@@ -12,6 +10,11 @@
#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
#include <utility> // pair, declval
#include <utility> // pair, declval
#ifndef JSON_NO_IO
#include <cstdio> //FILE *
#include <istream> // istream
#endif // JSON_NO_IO
#include <nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/macro_scope.hpp>
...
...
include/nlohmann/detail/output/output_adapters.hpp
View file @
ae9bbbc9
...
@@ -2,12 +2,16 @@
...
@@ -2,12 +2,16 @@
#include <algorithm> // copy
#include <algorithm> // copy
#include <cstddef> // size_t
#include <cstddef> // size_t
#include <ios> // streamsize
#include <iterator> // back_inserter
#include <iterator> // back_inserter
#include <memory> // shared_ptr, make_shared
#include <memory> // shared_ptr, make_shared
#include <ostream> // basic_ostream
#include <string> // basic_string
#include <string> // basic_string
#include <vector> // vector
#include <vector> // vector
#ifndef JSON_NO_IO
#include <ios> // streamsize
#include <ostream> // basic_ostream
#endif // JSON_NO_IO
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/macro_scope.hpp>
namespace
nlohmann
namespace
nlohmann
...
...
include/nlohmann/json.hpp
View file @
ae9bbbc9
...
@@ -38,7 +38,9 @@ SOFTWARE.
...
@@ -38,7 +38,9 @@ SOFTWARE.
#include <cstddef> // nullptr_t, ptrdiff_t, size_t
#include <cstddef> // nullptr_t, ptrdiff_t, size_t
#include <functional> // hash, less
#include <functional> // hash, less
#include <initializer_list> // initializer_list
#include <initializer_list> // initializer_list
#include <iosfwd> // istream, ostream
#ifndef JSON_NO_IO
#include <iosfwd> // istream, ostream
#endif // JSON_NO_IO
#include <iterator> // random_access_iterator_tag
#include <iterator> // random_access_iterator_tag
#include <memory> // unique_ptr
#include <memory> // unique_ptr
#include <numeric> // accumulate
#include <numeric> // accumulate
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment