Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
fa7f1a52
Commit
fa7f1a52
authored
6 years ago
by
Jonathan Dumaresq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new unified json.hpp generated with make amalgamate
parent
ef283e0c
develop
bon8
coverity_scan
feature/optional
gcc_warning_flags
icpc
issue2228
issue2615
issue2932
issue3232_use_catch
master
release/3.10.2
release/3.10.3
release/3.10.4
release/3.10.5
string_view
string_view2
update_doctest
3.6.1
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.9.1
v3.9.0
v3.8.0
v3.7.3
v3.7.2
v3.7.1
v3.7.0
v3.6.1
v3.6.0
v3.5.0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
21 deletions
+24
-21
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+24
-21
No files found.
single_include/nlohmann/json.hpp
View file @
fa7f1a52
...
...
@@ -55,7 +55,6 @@ SOFTWARE.
#include <memory> // allocator
#include <string> // string
#include <vector> // vector
#include <cstdio>
/*!
@brief namespace for Niels Lohmann
...
...
@@ -2059,6 +2058,7 @@ constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
#include <string> // string, char_traits
#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
#include <utility> // pair, declval
#include <cstdio> //FILE *
// #include <nlohmann/detail/macro_scope.hpp>
...
...
@@ -2095,6 +2095,27 @@ struct input_adapter_protocol
/// a type to simplify interfaces
using
input_adapter_t
=
std
::
shared_ptr
<
input_adapter_protocol
>
;
/*!
Input adapter for stdio file access. This adapter read only 1 byte and do not use any
buffer. This adapter is a very low level adapter. This adapter
*/
class
file_input_adapter
:
public
input_adapter_protocol
{
public:
explicit
file_input_adapter
(
const
FILE
*
file
)
noexcept
:
file
(
file
)
{}
std
::
char_traits
<
char
>::
int_type
get_character
()
noexcept
override
{
return
fgetc
(
const_cast
<
FILE
*>
(
file
));
}
private:
/// the file pointer to read from
const
FILE
*
file
;
};
/*!
Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
beginning of input. Does not support changing the underlying std::streambuf
...
...
@@ -2286,22 +2307,6 @@ struct wide_string_input_helper<WideStringType, 2>
}
};
class
file_input_adapter
:
public
input_adapter_protocol
{
public:
explicit
file_input_adapter
(
const
FILE
*
file
)
noexcept
:
file
(
file
)
{}
std
::
char_traits
<
char
>::
int_type
get_character
()
noexcept
override
{
return
fgetc
(
const_cast
<
FILE
*>
(
file
));
}
private:
/// the file pointer to read from
const
FILE
*
file
;
};
template
<
typename
WideStringType
>
class
wide_string_input_adapter
:
public
input_adapter_protocol
{
...
...
@@ -2353,7 +2358,8 @@ class input_adapter
{
public:
// native support
input_adapter
(
FILE
*
file
)
:
ia
(
std
::
make_shared
<
file_input_adapter
>
(
file
))
{}
/// input adapter for input stream
input_adapter
(
std
::
istream
&
i
)
:
ia
(
std
::
make_shared
<
input_stream_adapter
>
(
i
))
{}
...
...
@@ -2371,9 +2377,6 @@ class input_adapter
input_adapter
(
const
std
::
u32string
&
ws
)
:
ia
(
std
::
make_shared
<
wide_string_input_adapter
<
std
::
u32string
>>
(
ws
))
{}
input_adapter
(
const
FILE
*
file
)
:
ia
(
std
::
make_shared
<
file_input_adapter
>
(
file
))
{}
/// input adapter for buffer
template
<
typename
CharT
,
typename
std
::
enable_if
<
...
...
This diff is collapsed.
Click to expand it.
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