gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clang errors/warnings

Browse Source
This commit is contained in:
Milo Yip 2015-05-07 15:12:25 +08:00
parent bbbd1c6f5e
commit f19a1b6abc
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/rapidjson/schema.h
View File

@ -344,7 +344,6 @@ public:
} }
if (oneOf_.schemas) { if (oneOf_.schemas) {
CreateSchemaValidators(context, context.oneOfValidators, oneOf_);
bool oneValid = false; bool oneValid = false;
for (SizeType i_ = 0; i_ < oneOf_.count; i_++) for (SizeType i_ = 0; i_ < oneOf_.count; i_++)
if (context.oneOfValidators.validators[i_]->IsValid()) { if (context.oneOfValidators.validators[i_]->IsValid()) {
@ -594,19 +593,19 @@ private:
} }
void CreateLogicValidators(Context& context) const { void CreateLogicValidators(Context& context) const {
if (allOf_.schemas) CreateSchemaValidators(context, context.allOfValidators, allOf_); if (allOf_.schemas) CreateSchemaValidators(context.allOfValidators, allOf_);
if (anyOf_.schemas) CreateSchemaValidators(context, context.anyOfValidators, anyOf_); if (anyOf_.schemas) CreateSchemaValidators(context.anyOfValidators, anyOf_);
if (oneOf_.schemas) CreateSchemaValidators(context, context.oneOfValidators, oneOf_); if (oneOf_.schemas) CreateSchemaValidators(context.oneOfValidators, oneOf_);
if (not_ && !context.notValidator) if (not_ && !context.notValidator)
context.notValidator = new GenericSchemaValidator<Encoding>(*not_); context.notValidator = new GenericSchemaValidator<Encoding, BaseReaderHandler<>, CrtAllocator>(*not_);
} }
void CreateSchemaValidators(Context& context, SchemaValidatorArray<Encoding>& validators, const BaseSchemaArray<Encoding>& schemas) const { void CreateSchemaValidators(SchemaValidatorArray<Encoding>& validators, const BaseSchemaArray<Encoding>& schemas) const {
if (!validators.validators) { if (!validators.validators) {
validators.validators = new GenericSchemaValidator<Encoding>*[schemas.count]; validators.validators = new GenericSchemaValidator<Encoding, BaseReaderHandler<>, CrtAllocator>*[schemas.count];
validators.count = schemas.count; validators.count = schemas.count;
for (SizeType i = 0; i < schemas.count; i++) for (SizeType i = 0; i < schemas.count; i++)
validators.validators[i] = new GenericSchemaValidator<Encoding>(*schemas.schemas[i]); validators.validators[i] = new GenericSchemaValidator<Encoding, BaseReaderHandler<>, CrtAllocator>(*schemas.schemas[i]);
} }
} }