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

Allow create validator from rvalue json

Browse Source
This commit is contained in:
Sven Fink 2020-02-10 13:51:48 +01:00 committed by Patrick Boettcher
parent 01e3dea71b
commit d84e0a28d6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/json-validator.cpp
View File

@ -1129,16 +1129,22 @@ namespace json_schema
json_validator::json_validator(schema_loader loader,
format_checker format)
: root_(std::unique_ptr<root_schema>(new root_schema(loader, format)))
: root_(std::unique_ptr<root_schema>(new root_schema(std::move(loader), std::move(format))))
{
}
json_validator::json_validator(const json &schema, schema_loader loader, format_checker format)
: json_validator(loader, format)
: json_validator(std::move(loader), std::move(format))
{
set_root_schema(schema);
}
json_validator::json_validator(json &&schema, schema_loader loader, format_checker format)
: json_validator(std::move(loader), std::move(format))
{
set_root_schema(std::move(schema));
}
// 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;

1
src/nlohmann/json-schema.hpp
View File

@ -171,6 +171,7 @@ public:
json_validator(schema_loader = nullptr, format_checker = nullptr);
json_validator(json_validator &&);
json_validator(const json &, schema_loader = nullptr, format_checker = nullptr);
json_validator(json &&, schema_loader = nullptr, format_checker = nullptr);
~json_validator();
json_validator &operator=(json_validator &&);