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
f28fc226
Unverified
Commit
f28fc226
authored
7 years ago
by
Niels Lohmann
Committed by
GitHub
7 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #858 from mattismyname/develop
Fix up a few more effc++ items
parents
3113a52a
72bff90e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
src/json.hpp
src/json.hpp
+8
-8
No files found.
src/json.hpp
View file @
f28fc226
...
...
@@ -3526,7 +3526,7 @@ class primitive_iterator_t
return
*
this
;
}
primitive_iterator_t
operator
++
(
int
)
primitive_iterator_t
const
operator
++
(
int
)
{
auto
result
=
*
this
;
m_it
++
;
...
...
@@ -3539,7 +3539,7 @@ class primitive_iterator_t
return
*
this
;
}
primitive_iterator_t
operator
--
(
int
)
primitive_iterator_t
const
operator
--
(
int
)
{
auto
result
=
*
this
;
m_it
--
;
...
...
@@ -3850,7 +3850,7 @@ class iter_impl
@brief post-increment (it++)
@pre The iterator is initialized; i.e. `m_object != nullptr`.
*/
iter_impl
operator
++
(
int
)
iter_impl
const
operator
++
(
int
)
{
auto
result
=
*
this
;
++
(
*
this
);
...
...
@@ -3893,7 +3893,7 @@ class iter_impl
@brief post-decrement (it--)
@pre The iterator is initialized; i.e. `m_object != nullptr`.
*/
iter_impl
operator
--
(
int
)
iter_impl
const
operator
--
(
int
)
{
auto
result
=
*
this
;
--
(
*
this
);
...
...
@@ -4299,7 +4299,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
json_reverse_iterator
(
const
base_iterator
&
it
)
noexcept
:
base_iterator
(
it
)
{}
/// post-increment (it++)
json_reverse_iterator
operator
++
(
int
)
json_reverse_iterator
const
operator
++
(
int
)
{
return
static_cast
<
json_reverse_iterator
>
(
base_iterator
::
operator
++
(
1
));
}
...
...
@@ -4311,7 +4311,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
}
/// post-decrement (it--)
json_reverse_iterator
operator
--
(
int
)
json_reverse_iterator
const
operator
--
(
int
)
{
return
static_cast
<
json_reverse_iterator
>
(
base_iterator
::
operator
--
(
1
));
}
...
...
@@ -6567,7 +6567,8 @@ class serializer
// the codepoint from the UTF-8 bytes
int
codepoint
=
0
;
assert
(
0
<=
bytes
and
bytes
<=
3
);
// bytes is unsigned type:
assert
(
bytes
<=
3
);
switch
(
bytes
)
{
case
0
:
...
...
@@ -7046,7 +7047,6 @@ class json_pointer
return
result
;
}
/*!
@brief create and return a reference to the pointed to value
...
...
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