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
c02de445
Unverified
Commit
c02de445
authored
7 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed more compiler warnings
parent
66dd1a84
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/input_adapters.hpp
+1
-1
include/nlohmann/detail/iterators/json_reverse_iterator.hpp
include/nlohmann/detail/iterators/json_reverse_iterator.hpp
+2
-2
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+5
-5
No files found.
include/nlohmann/detail/input/input_adapters.hpp
View file @
c02de445
...
@@ -119,7 +119,7 @@ template<typename WideStringType>
...
@@ -119,7 +119,7 @@ template<typename WideStringType>
class
wide_string_input_adapter
:
public
input_adapter_protocol
class
wide_string_input_adapter
:
public
input_adapter_protocol
{
{
public:
public:
wide_string_input_adapter
(
const
WideStringType
&
w
)
:
str
(
w
)
{}
explicit
wide_string_input_adapter
(
const
WideStringType
&
w
)
:
str
(
w
)
{}
std
::
char_traits
<
char
>::
int_type
get_character
()
noexcept
override
std
::
char_traits
<
char
>::
int_type
get_character
()
noexcept
override
{
{
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/iterators/json_reverse_iterator.hpp
View file @
c02de445
...
@@ -41,11 +41,11 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
...
@@ -41,11 +41,11 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
using
reference
=
typename
Base
::
reference
;
using
reference
=
typename
Base
::
reference
;
/// create reverse iterator from iterator
/// create reverse iterator from iterator
json_reverse_iterator
(
const
typename
base_iterator
::
iterator_type
&
it
)
noexcept
explicit
json_reverse_iterator
(
const
typename
base_iterator
::
iterator_type
&
it
)
noexcept
:
base_iterator
(
it
)
{}
:
base_iterator
(
it
)
{}
/// create reverse iterator from base class
/// create reverse iterator from base class
json_reverse_iterator
(
const
base_iterator
&
it
)
noexcept
:
base_iterator
(
it
)
{}
explicit
json_reverse_iterator
(
const
base_iterator
&
it
)
noexcept
:
base_iterator
(
it
)
{}
/// post-increment (it++)
/// post-increment (it++)
json_reverse_iterator
const
operator
++
(
int
)
json_reverse_iterator
const
operator
++
(
int
)
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
c02de445
...
@@ -1733,7 +1733,7 @@ template<typename WideStringType>
...
@@ -1733,7 +1733,7 @@ template<typename WideStringType>
class
wide_string_input_adapter
:
public
input_adapter_protocol
class
wide_string_input_adapter
:
public
input_adapter_protocol
{
{
public:
public:
wide_string_input_adapter
(
const
WideStringType
&
w
)
:
str
(
w
)
{}
explicit
wide_string_input_adapter
(
const
WideStringType
&
w
)
:
str
(
w
)
{}
std
::
char_traits
<
char
>::
int_type
get_character
()
noexcept
override
std
::
char_traits
<
char
>::
int_type
get_character
()
noexcept
override
{
{
...
@@ -4593,7 +4593,7 @@ class primitive_iterator_t
...
@@ -4593,7 +4593,7 @@ class primitive_iterator_t
primitive_iterator_t
const
operator
++
(
int
)
noexcept
primitive_iterator_t
const
operator
++
(
int
)
noexcept
{
{
auto
result
=
*
this
;
auto
result
=
*
this
;
m_it
++
;
++
m_it
;
return
result
;
return
result
;
}
}
...
@@ -4606,7 +4606,7 @@ class primitive_iterator_t
...
@@ -4606,7 +4606,7 @@ class primitive_iterator_t
primitive_iterator_t
const
operator
--
(
int
)
noexcept
primitive_iterator_t
const
operator
--
(
int
)
noexcept
{
{
auto
result
=
*
this
;
auto
result
=
*
this
;
m_it
--
;
--
m_it
;
return
result
;
return
result
;
}
}
...
@@ -5433,11 +5433,11 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
...
@@ -5433,11 +5433,11 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
using
reference
=
typename
Base
::
reference
;
using
reference
=
typename
Base
::
reference
;
/// create reverse iterator from iterator
/// create reverse iterator from iterator
json_reverse_iterator
(
const
typename
base_iterator
::
iterator_type
&
it
)
noexcept
explicit
json_reverse_iterator
(
const
typename
base_iterator
::
iterator_type
&
it
)
noexcept
:
base_iterator
(
it
)
{}
:
base_iterator
(
it
)
{}
/// create reverse iterator from base class
/// create reverse iterator from base class
json_reverse_iterator
(
const
base_iterator
&
it
)
noexcept
:
base_iterator
(
it
)
{}
explicit
json_reverse_iterator
(
const
base_iterator
&
it
)
noexcept
:
base_iterator
(
it
)
{}
/// post-increment (it++)
/// post-increment (it++)
json_reverse_iterator
const
operator
++
(
int
)
json_reverse_iterator
const
operator
++
(
int
)
...
...
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