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
f1969e60
Commit
f1969e60
authored
May 27, 2020
by
Francois Chabot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reamalgamate
parent
5684d9a4
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
78 additions
and
127 deletions
+78
-127
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+67
-122
test/src/unit-user_defined_input.cpp
test/src/unit-user_defined_input.cpp
+10
-4
No files found.
include/nlohmann/json.hpp
View file @
f1969e60
...
...
@@ -6750,7 +6750,7 @@ class basic_json
}
/*!
@brief deserialize from stream
...
...
single_include/nlohmann/json.hpp
View file @
f1969e60
This diff is collapsed.
Click to expand it.
test/src/unit-user_defined_input.cpp
View file @
f1969e60
...
...
@@ -79,7 +79,8 @@ TEST_CASE("Custom iterator")
{
const
char
*
raw_data
=
"[1,2,3,4]"
;
struct
MyIterator
{
struct
MyIterator
{
using
difference_type
=
std
::
size_t
;
using
value_type
=
char
;
using
pointer
=
const
char
*
;
...
...
@@ -87,13 +88,18 @@ TEST_CASE("Custom iterator")
using
iterator_category
=
std
::
input_iterator_tag
;
MyIterator
&
operator
++
()
{
MyIterator
&
operator
++
()
{
++
ptr
;
return
*
this
;
}
reference
operator
*
()
const
{
return
*
ptr
;}
bool
operator
!=
(
const
MyIterator
&
rhs
)
const
{
reference
operator
*
()
const
{
return
*
ptr
;
}
bool
operator
!=
(
const
MyIterator
&
rhs
)
const
{
return
ptr
!=
rhs
.
ptr
;
}
...
...
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