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
611fd225
Unverified
Commit
611fd225
authored
Aug 20, 2021
by
Niels Lohmann
Committed by
GitHub
Aug 20, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2957 from Hallot/bug/fix-some-clang-warnings
Fix some extra ";" clang warnings
parents
44ffaa05
43360484
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
include/nlohmann/detail/conversions/to_json.hpp
include/nlohmann/detail/conversions/to_json.hpp
+1
-1
include/nlohmann/detail/output/binary_writer.hpp
include/nlohmann/detail/output/binary_writer.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+2
-2
test/thirdparty/Fuzzer/FuzzerDriver.cpp
test/thirdparty/Fuzzer/FuzzerDriver.cpp
+1
-1
No files found.
include/nlohmann/detail/conversions/to_json.hpp
View file @
611fd225
...
...
@@ -94,7 +94,7 @@ struct external_constructor<value_t::binary>
{
j
.
m_value
.
destroy
(
j
.
m_type
);
j
.
m_type
=
value_t
::
binary
;
j
.
m_value
=
typename
BasicJsonType
::
binary_t
(
std
::
move
(
b
));
;
j
.
m_value
=
typename
BasicJsonType
::
binary_t
(
std
::
move
(
b
));
j
.
assert_invariant
();
}
};
...
...
include/nlohmann/detail/output/binary_writer.hpp
View file @
611fd225
...
...
@@ -67,7 +67,7 @@ class binary_writer
case
value_t
:
:
discarded
:
default:
{
JSON_THROW
(
type_error
::
create
(
317
,
"to serialize to BSON, top-level type must be object, but is "
+
std
::
string
(
j
.
type_name
()),
j
));
;
JSON_THROW
(
type_error
::
create
(
317
,
"to serialize to BSON, top-level type must be object, but is "
+
std
::
string
(
j
.
type_name
()),
j
));
}
}
}
...
...
single_include/nlohmann/json.hpp
View file @
611fd225
...
...
@@ -4602,7 +4602,7 @@ struct external_constructor<value_t::binary>
{
j
.
m_value
.
destroy
(
j
.
m_type
);
j
.
m_type
=
value_t
::
binary
;
j
.
m_value
=
typename
BasicJsonType
::
binary_t
(
std
::
move
(
b
));
;
j
.
m_value
=
typename
BasicJsonType
::
binary_t
(
std
::
move
(
b
));
j
.
assert_invariant
();
}
};
...
...
@@ -13617,7 +13617,7 @@ class binary_writer
case
value_t
:
:
discarded
:
default:
{
JSON_THROW
(
type_error
::
create
(
317
,
"to serialize to BSON, top-level type must be object, but is "
+
std
::
string
(
j
.
type_name
()),
j
));
;
JSON_THROW
(
type_error
::
create
(
317
,
"to serialize to BSON, top-level type must be object, but is "
+
std
::
string
(
j
.
type_name
()),
j
));
}
}
}
...
...
test/thirdparty/Fuzzer/FuzzerDriver.cpp
View file @
611fd225
...
...
@@ -148,7 +148,7 @@ static bool ParseOneFlag(const char *Param) {
int
Val
=
MyStol
(
Str
);
*
FlagDescriptions
[
F
].
IntFlag
=
Val
;
if
(
Flags
.
verbosity
>=
2
)
Printf
(
"Flag: %s %d
\n
"
,
Name
,
Val
);
;
Printf
(
"Flag: %s %d
\n
"
,
Name
,
Val
);
return
true
;
}
else
if
(
FlagDescriptions
[
F
].
UIntFlag
)
{
unsigned
int
Val
=
std
::
stoul
(
Str
);
...
...
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