External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2957 from Hallot/bug/fix-some-clang-warnings

Browse Source 
Fix some extra ";" clang warnings
This commit is contained in:
Niels Lohmann 2021-08-20 13:32:38 +02:00 committed by GitHub
commit 611fd22557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/conversions/to_json.hpp
View File

@ -94,7 +94,7 @@ struct external_constructor<value_t::binary>
{ {
j.m_value.destroy(j.m_type); j.m_value.destroy(j.m_type);
j.m_type = value_t::binary; 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(); j.assert_invariant();
} }
}; };

2
include/nlohmann/detail/output/binary_writer.hpp
View File

@ -67,7 +67,7 @@ class binary_writer
case value_t::discarded: case value_t::discarded:
default: 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));
} }
} }
} }

4
single_include/nlohmann/json.hpp
View File

@ -4602,7 +4602,7 @@ struct external_constructor<value_t::binary>
{ {
j.m_value.destroy(j.m_type); j.m_value.destroy(j.m_type);
j.m_type = value_t::binary; 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(); j.assert_invariant();
} }
}; };
@ -13617,7 +13617,7 @@ class binary_writer
case value_t::discarded: case value_t::discarded:
default: 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));
} }
} }
} }

2
test/thirdparty/Fuzzer/FuzzerDriver.cpp vendored
View File

@ -148,7 +148,7 @@ static bool ParseOneFlag(const char *Param) {
int Val = MyStol(Str); int Val = MyStol(Str);
*FlagDescriptions[F].IntFlag = Val; *FlagDescriptions[F].IntFlag = Val;
if (Flags.verbosity >= 2) if (Flags.verbosity >= 2)
Printf("Flag: %s %d\n", Name, Val);; Printf("Flag: %s %d\n", Name, Val);
return true; return true;
} else if (FlagDescriptions[F].UIntFlag) { } else if (FlagDescriptions[F].UIntFlag) {
unsigned int Val = std::stoul(Str); unsigned int Val = std::stoul(Str);