generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2025-03-04 07:27:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'jhjensen-warnfix'

Browse Source
This commit is contained in:
Tristan Penman 2016-03-03 08:34:01 +11:00
commit c4d0c063c7
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/valijson/constraints/concrete_constraints.hpp
View File

@ -441,7 +441,7 @@ public:
}
private:
uint64_t maxItems;
size_t maxItems;
};
/**
@ -495,7 +495,7 @@ public:
}
private:
uint64_t maxProperties;
size_t maxProperties;
};
/**
@ -562,7 +562,7 @@ public:
}
private:
uint64_t minItems;
size_t minItems;
};
/**
@ -616,7 +616,7 @@ public:
}
private:
uint64_t minProperties;
size_t minProperties;
};
/**

2
include/valijson/schema.hpp
View File

@ -46,7 +46,7 @@ public:
virtual ~Schema()
{
sharedEmptySubschema->~Subschema();
freeFn((void*)(sharedEmptySubschema));
freeFn(const_cast<Subschema *>(sharedEmptySubschema));
sharedEmptySubschema = NULL;
try {

2
include/valijson/schema_parser.hpp
View File

@ -444,7 +444,7 @@ private:
Schema &rootSchema,
const std::string &jsonRef,
const AdapterType &rootNode,
const AdapterType &node,
const AdapterType &,
const Subschema &subschema,
const boost::optional<std::string> currentScope,
const std::string &nodePath,

4
include/valijson/subschema.hpp
View File

@ -66,9 +66,9 @@ public:
try {
for (std::vector<const Constraint *>::iterator itr =
constraints.begin(); itr != constraints.end(); ++itr) {
const Constraint *constraint = *itr;
Constraint *constraint = const_cast<Constraint *>(*itr);
constraint->~Constraint();
freeFn((void*)(constraint));
freeFn(constraint);
}
constraints.clear();
} catch (const std::exception &e) {

2
include/valijson/validation_visitor.hpp
View File

@ -1026,7 +1026,7 @@ public:
*
* @return true if validation succeeds, false otherwise
*/
virtual bool visit(const UniqueItemsConstraint &constraint)
virtual bool visit(const UniqueItemsConstraint &)
{
if ((strictTypes && !target.isArray()) || !target.maybeArray()) {
return true;