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
cf8251eb
Unverified
Commit
cf8251eb
authored
Jul 14, 2019
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🚑
fix compiler errors
parent
6c7cde18
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
20 deletions
+4
-20
include/nlohmann/detail/iterators/iter_impl.hpp
include/nlohmann/detail/iterators/iter_impl.hpp
+0
-8
include/nlohmann/detail/json_pointer.hpp
include/nlohmann/detail/json_pointer.hpp
+2
-2
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+2
-10
No files found.
include/nlohmann/detail/iterators/iter_impl.hpp
View file @
cf8251eb
...
...
@@ -164,14 +164,6 @@ class iter_impl
return
*
this
;
}
/// @copydoc operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>&)
iter_impl
&
operator
=
(
const
iter_impl
<
const
BasicJsonType
>&
other
)
noexcept
{
m_object
=
other
.
m_object
;
m_it
=
other
.
m_it
;
return
*
this
;
}
private:
/*!
@brief set the iterator to the first value
...
...
include/nlohmann/detail/json_pointer.hpp
View file @
cf8251eb
...
...
@@ -718,14 +718,14 @@ class json_pointer
case
detail
:
:
value_t
::
array
:
{
if
(
JSON_UNLIKELY
(
reference_token
==
"-"
))
if
(
JSON_
HEDLEY_
UNLIKELY
(
reference_token
==
"-"
))
{
// "-" always fails the range check
return
false
;
}
// error condition (cf. RFC 6901, Sect. 4)
if
(
JSON_UNLIKELY
(
reference_token
.
size
()
>
1
and
reference_token
[
0
]
==
'0'
))
if
(
JSON_
HEDLEY_
UNLIKELY
(
reference_token
.
size
()
>
1
and
reference_token
[
0
]
==
'0'
))
{
JSON_THROW
(
detail
::
parse_error
::
create
(
106
,
0
,
"array index '"
+
reference_token
+
...
...
single_include/nlohmann/json.hpp
View file @
cf8251eb
...
...
@@ -9363,14 +9363,6 @@ class iter_impl
return
*
this
;
}
/// @copydoc operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>&)
iter_impl
&
operator
=
(
const
iter_impl
<
const
BasicJsonType
>&
other
)
noexcept
{
m_object
=
other
.
m_object
;
m_it
=
other
.
m_it
;
return
*
this
;
}
private:
/*!
@brief set the iterator to the first value
...
...
@@ -10693,14 +10685,14 @@ class json_pointer
case
detail
:
:
value_t
::
array
:
{
if
(
JSON_UNLIKELY
(
reference_token
==
"-"
))
if
(
JSON_
HEDLEY_
UNLIKELY
(
reference_token
==
"-"
))
{
// "-" always fails the range check
return
false
;
}
// error condition (cf. RFC 6901, Sect. 4)
if
(
JSON_UNLIKELY
(
reference_token
.
size
()
>
1
and
reference_token
[
0
]
==
'0'
))
if
(
JSON_
HEDLEY_
UNLIKELY
(
reference_token
.
size
()
>
1
and
reference_token
[
0
]
==
'0'
))
{
JSON_THROW
(
detail
::
parse_error
::
create
(
106
,
0
,
"array index '"
+
reference_token
+
...
...
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