generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2025-01-19 08:46:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix errors introduced during rebase

Browse Source
This commit is contained in:
Tristan Penman 2016-03-20 14:07:25 +11:00
parent 9f94ad5883
commit e2a011edc0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/valijson/schema_parser.hpp
View File

@ -930,8 +930,9 @@ private:
// TODO: Need to detect degenerate circular references
resolveThenPopulateSchema(rootSchema, newRootNode,
referencedAdapter, schema, boost::none, actualJsonPointer,
fetchDoc, parentSchema, ownName, docCache, schemaCache);
referencedAdapter, subschema, boost::none,
actualJsonPointer, fetchDoc, parentSchema, ownName,
docCache, schemaCache);
} else {
const AdapterType &referencedAdapter =
@ -940,7 +941,7 @@ private:
// TODO: Need to detect degenerate circular references
resolveThenPopulateSchema(rootSchema, rootNode, referencedAdapter,
schema, boost::none, actualJsonPointer, fetchDoc,
subschema, boost::none, actualJsonPointer, fetchDoc,
parentSchema, ownName, docCache, schemaCache);
}
}