luo980/json-schema-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix format and remove unused arg-warning

Browse Source
This commit is contained in:
Patrick Boettcher 2019-01-24 18:25:06 +01:00
parent 011bd4470e
commit 4b6330a0a8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/json-schema.hpp
View File

@ -139,9 +139,9 @@ class JSON_SCHEMA_VALIDATOR_API json_validator
public: public:
json_validator(std::function<void(const json_uri &, json &)> loader = nullptr, json_validator(std::function<void(const json_uri &, json &)> loader = nullptr,
std::function<void(const std::string &, const std::string &)> format = nullptr); std::function<void(const std::string &, const std::string &)> format = nullptr);
json_validator(json_validator&&); json_validator(json_validator &&);
~json_validator(); ~json_validator();
json_validator& operator=(json_validator&&); json_validator &operator=(json_validator &&);
// insert and set thea root-schema // insert and set thea root-schema
void set_root_schema(const json &); void set_root_schema(const json &);

10
src/json-validator.cpp
View File

@ -305,7 +305,7 @@ template <>
const std::string logical_combination<oneOf>::key = "oneOf"; const std::string logical_combination<oneOf>::key = "oneOf";
template <> template <>
bool logical_combination<allOf>::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t count) bool logical_combination<allOf>::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t)
{ {
if (err) if (err)
e.error("", instance, "at least one schema has failed, but ALLOF them are required to validate."); e.error("", instance, "at least one schema has failed, but ALLOF them are required to validate.");
@ -313,13 +313,13 @@ bool logical_combination<allOf>::is_validate_complete(const json &instance, basi
} }
template <> template <>
bool logical_combination<anyOf>::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t count) bool logical_combination<anyOf>::is_validate_complete(const json &, basic_error_handler &, bool, size_t count)
{ {
return count == 1; return count == 1;
} }
template <> template <>
bool logical_combination<oneOf>::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t count) bool logical_combination<oneOf>::is_validate_complete(const json &instance, basic_error_handler &e, bool, size_t count)
{ {
if (count > 1) if (count > 1)
e.error("", instance, "more than one schema has succeeded, but only ONEOF them is required to validate."); e.error("", instance, "more than one schema has succeeded, but only ONEOF them is required to validate.");
@ -1101,9 +1101,9 @@ json_validator::json_validator(std::function<void(const json_uri &, json &)> loa
// move constructor, destructor and move assignment operator can be defaulted here // move constructor, destructor and move assignment operator can be defaulted here
// where root_schema is a complete type // where root_schema is a complete type
json_validator::json_validator(json_validator&&) = default; json_validator::json_validator(json_validator &&) = default;
json_validator::~json_validator() = default; json_validator::~json_validator() = default;
json_validator& json_validator::operator=(json_validator&&) = default; json_validator &json_validator::operator=(json_validator &&) = default;
void json_validator::set_root_schema(const json &schema) void json_validator::set_root_schema(const json &schema)
{ {