diff --git a/src/assertions.numeric.cpp b/src/assertions.numeric.cpp index 9e200fa..965b4d0 100644 --- a/src/assertions.numeric.cpp +++ b/src/assertions.numeric.cpp @@ -29,13 +29,13 @@ namespace { return p(bound.value(), v) ? f5::json::validation::result{std::move(an)} : f5::json::validation::result{ - rule, an.spos, an.dpos}; + rule, an.spos, an.dpos}; }, [&](double v) mutable { return p(bound.value(), v) ? f5::json::validation::result{std::move(an)} : f5::json::validation::result{ - rule, an.spos, an.dpos}; + rule, an.spos, an.dpos}; }, [&](const auto &) mutable { return f5::json::validation::result{std::move(an)}; @@ -46,7 +46,7 @@ namespace { return p(bound.value(), v) ? f5::json::validation::result{std::move(an)} : f5::json::validation::result{ - rule, an.spos, an.dpos}; + rule, an.spos, an.dpos}; }, [&](double v) mutable { bool passed; @@ -58,7 +58,7 @@ namespace { return passed ? f5::json::validation::result{std::move(an)} : f5::json::validation::result{ - rule, an.spos, an.dpos}; + rule, an.spos, an.dpos}; }, [&](const auto &) mutable { return f5::json::validation::result{std::move(an)}; diff --git a/src/schema.loaders.cpp b/src/schema.loaders.cpp index 4a12221..761c60d 100644 --- a/src/schema.loaders.cpp +++ b/src/schema.loaders.cpp @@ -1,5 +1,6 @@ /** - Copyright 2018-2019, Proteus Technologies Co Ltd. + Copyright 2018-2019, Proteus Technologies Co Ltd. + Distributed under the Boost Software License, Version 1.0. See @@ -23,7 +24,8 @@ const fostlib::setting f5::json::c_schema_loaders( namespace { const fostlib::module c_fost_json_schema{fostlib::c_fost, "json-schema"}; - const fostlib::module c_fost_json_schema_loader{c_fost_json_schema, "loader"}; + const fostlib::module c_fost_json_schema_loader{c_fost_json_schema, + "loader"}; } @@ -96,7 +98,8 @@ namespace { config["base"])}; fostlib::url fetch{ base, url.substr(prefix.code_points())}; - logger("base", base)("fetching", fetch)("found", true); + logger("base", + base)("fetching", fetch)("found", true); try { return http(base, fetch); } catch (fostlib::exceptions::exception &e) { @@ -116,7 +119,8 @@ namespace { } } else { logger("found", false); - logger("reason", "URL doesn't start with supplied prefix"); + logger("reason", + "URL doesn't start with supplied prefix"); } } else { logger("found", false); diff --git a/test/testsuite-v7/testsuite.cpp b/test/testsuite-v7/testsuite.cpp index 7624acb..2d55b76 100644 --- a/test/testsuite-v7/testsuite.cpp +++ b/test/testsuite-v7/testsuite.cpp @@ -18,14 +18,17 @@ namespace { const fostlib::setting c_verbose( __FILE__, "json-schema-testsuite", "Verbose", false, true); - const fostlib::setting - c_base(__FILE__, - "json-schema-testsuite", - "Base URL", - "https://raw.githubusercontent.com/" - "json-schema-org/JSON-Schema-Test-Suite/" - "master/tests/draft7/", - true); + const fostlib::setting c_base( + __FILE__, + "json-schema-testsuite", + "Base URL", + "https://raw.githubusercontent.com/json-schema-org/" + "JSON-Schema-Test-Suite/e64ebf90a001f4e0e18984d2086ea15765cfead2/" + "tests/draft7/", + //"https://raw.githubusercontent.com/" + //"json-schema-org/JSON-Schema-Test-Suite/" + //"master/tests/draft7/", + true); const fostlib::setting c_loaders{ __FILE__, f5::json::c_schema_loaders, []() {