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
c1c85b02
Commit
c1c85b02
authored
6 years ago
by
Jonathan Dumaresq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forget one std::FILE
parent
635a4fc3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/input_adapters.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+1
-1
No files found.
include/nlohmann/detail/input/input_adapters.hpp
View file @
c1c85b02
...
@@ -309,7 +309,7 @@ class input_adapter
...
@@ -309,7 +309,7 @@ class input_adapter
{
{
public:
public:
// native support
// native support
input_adapter
(
FILE
*
file
)
input_adapter
(
std
::
FILE
*
file
)
:
ia
(
std
::
make_shared
<
file_input_adapter
>
(
file
))
{}
:
ia
(
std
::
make_shared
<
file_input_adapter
>
(
file
))
{}
/// input adapter for input stream
/// input adapter for input stream
input_adapter
(
std
::
istream
&
i
)
input_adapter
(
std
::
istream
&
i
)
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
c1c85b02
...
@@ -2358,7 +2358,7 @@ class input_adapter
...
@@ -2358,7 +2358,7 @@ class input_adapter
{
{
public:
public:
// native support
// native support
input_adapter
(
FILE
*
file
)
input_adapter
(
std
::
FILE
*
file
)
:
ia
(
std
::
make_shared
<
file_input_adapter
>
(
file
))
{}
:
ia
(
std
::
make_shared
<
file_input_adapter
>
(
file
))
{}
/// input adapter for input stream
/// input adapter for input stream
input_adapter
(
std
::
istream
&
i
)
input_adapter
(
std
::
istream
&
i
)
...
...
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