From 4b6330a0a833cc288a2f74a09a7b28adbec8d3a1 Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Thu, 24 Jan 2019 18:25:06 +0100 Subject: [PATCH] fix format and remove unused arg-warning --- src/json-schema.hpp | 4 ++-- src/json-validator.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/json-schema.hpp b/src/json-schema.hpp index 5eaf31d..853282a 100644 --- a/src/json-schema.hpp +++ b/src/json-schema.hpp @@ -139,9 +139,9 @@ class JSON_SCHEMA_VALIDATOR_API json_validator public: json_validator(std::function loader = nullptr, std::function format = nullptr); - 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 void set_root_schema(const json &); diff --git a/src/json-validator.cpp b/src/json-validator.cpp index c876c8e..96a439d 100644 --- a/src/json-validator.cpp +++ b/src/json-validator.cpp @@ -305,7 +305,7 @@ template <> const std::string logical_combination::key = "oneOf"; template <> -bool logical_combination::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t count) +bool logical_combination::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t) { if (err) e.error("", instance, "at least one schema has failed, but ALLOF them are required to validate."); @@ -313,13 +313,13 @@ bool logical_combination::is_validate_complete(const json &instance, basi } template <> -bool logical_combination::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t count) +bool logical_combination::is_validate_complete(const json &, basic_error_handler &, bool, size_t count) { return count == 1; } template <> -bool logical_combination::is_validate_complete(const json &instance, basic_error_handler &e, bool err, size_t count) +bool logical_combination::is_validate_complete(const json &instance, basic_error_handler &e, bool, size_t count) { if (count > 1) 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 loa // move constructor, destructor and move assignment operator can be defaulted here // 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::operator=(json_validator&&) = default; +json_validator &json_validator::operator=(json_validator &&) = default; void json_validator::set_root_schema(const json &schema) {