mirror of
https://github.com/tristanpenman/valijson.git
synced 2025-03-03 12:58:03 +01:00
Merge branch 'jhjensen-warnfix'
This commit is contained in:
commit
c4d0c063c7
@ -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;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -46,7 +46,7 @@ public:
|
||||
virtual ~Schema()
|
||||
{
|
||||
sharedEmptySubschema->~Subschema();
|
||||
freeFn((void*)(sharedEmptySubschema));
|
||||
freeFn(const_cast<Subschema *>(sharedEmptySubschema));
|
||||
sharedEmptySubschema = NULL;
|
||||
|
||||
try {
|
||||
|
@ -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,
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user