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
8b14c9b3
Unverified
Commit
8b14c9b3
authored
Jul 21, 2020
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🚨
fix warnings
parent
83448577
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/binary_reader.hpp
+1
-1
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+2
-2
test/src/unit-cbor.cpp
test/src/unit-cbor.cpp
+4
-4
No files found.
include/nlohmann/detail/input/binary_reader.hpp
View file @
8b14c9b3
...
...
@@ -2279,7 +2279,7 @@ class binary_reader
success
=
false
;
break
;
}
result
.
push_back
(
st
d
::
char_traits
<
char_type
>::
to_char_type
(
current
));
result
.
push_back
(
st
atic_cast
<
typename
string_t
::
value_type
>
(
current
));
};
return
success
;
}
...
...
include/nlohmann/json.hpp
View file @
8b14c9b3
...
...
@@ -7507,7 +7507,7 @@ class basic_json
const
bool
allow_exceptions
=
true
,
const
cbor_tag_handler_t
tag_handler
=
cbor_tag_handler_t
::
error
)
{
return
from_cbor
(
ptr
,
ptr
+
len
,
strict
,
tag_handler
);
return
from_cbor
(
ptr
,
ptr
+
len
,
strict
,
allow_exceptions
,
tag_handler
);
}
...
...
single_include/nlohmann/json.hpp
View file @
8b14c9b3
...
...
@@ -8264,7 +8264,7 @@ class binary_reader
success
=
false
;
break
;
}
result
.
push_back
(
st
d
::
char_traits
<
char_type
>::
to_char_type
(
current
));
result
.
push_back
(
st
atic_cast
<
typename
string_t
::
value_type
>
(
current
));
};
return
success
;
}
...
...
@@ -23786,7 +23786,7 @@ class basic_json
const
bool
allow_exceptions
=
true
,
const
cbor_tag_handler_t
tag_handler
=
cbor_tag_handler_t
::
error
)
{
return
from_cbor
(
ptr
,
ptr
+
len
,
strict
,
tag_handler
);
return
from_cbor
(
ptr
,
ptr
+
len
,
strict
,
allow_exceptions
,
tag_handler
);
}
...
...
test/src/unit-cbor.cpp
View file @
8b14c9b3
...
...
@@ -2558,10 +2558,10 @@ TEST_CASE("Tagged values")
SECTION
(
"0xC6..0xD4"
)
{
for
(
std
::
uint8_t
b
:
{
0xC6
,
0xC7
,
0xC8
,
0xC9
,
0xCA
,
0xCB
,
0xCC
,
0xCD
,
0xCE
,
0xCF
,
0xD0
,
0xD1
,
0xD2
,
0xD3
,
0xD4
})
for
(
auto
b
:
std
::
vector
<
std
::
uint8_t
>
{
0xC6
,
0xC7
,
0xC8
,
0xC9
,
0xCA
,
0xCB
,
0xCC
,
0xCD
,
0xCE
,
0xCF
,
0xD0
,
0xD1
,
0xD2
,
0xD3
,
0xD4
})
{
// add tag to value
auto
v_tagged
=
v
;
...
...
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