diff --git a/README.md b/README.md index 61edd76..53f05e7 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ Required: - boost 1.54 -Later versions of boost (up to 1.57) are also known to work correctly. +Later versions of boost (up to 1.59) are also known to work correctly. ## Supported Parsers ## diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp index 3a143eb..176f9a9 100644 --- a/include/valijson/adapters/picojson_adapter.hpp +++ b/include/valijson/adapters/picojson_adapter.hpp @@ -188,7 +188,7 @@ public: * If an object member with the specified name does not exist, the iterator * returned will be the same as the iterator returned by the end() function. * - * @param property property name to search for + * @param propertyName property name to search for */ PicoJsonObjectMemberIterator find(const std::string &propertyName) const; @@ -539,9 +539,9 @@ public: * values, and assumes that two identical iterators will point to the same * underlying object. * - * @param rhs iterator to compare against + * @param other iterator to compare against * - * @returns true if the iterators are equal, false otherwise. + * @returns true if the iterators are equal, false otherwise. */ bool equal(const PicoJsonArrayValueIterator &other) const { @@ -612,7 +612,7 @@ public: * values, and assumes that two identical iterators will point to the same * underlying object. * - * @param rhs Iterator to compare with + * @param other Iterator to compare with * * @returns true if the underlying iterators are equal, false otherwise */ diff --git a/include/valijson/adapters/rapidjson_adapter.hpp b/include/valijson/adapters/rapidjson_adapter.hpp index 49e9e36..249f4e6 100644 --- a/include/valijson/adapters/rapidjson_adapter.hpp +++ b/include/valijson/adapters/rapidjson_adapter.hpp @@ -64,6 +64,7 @@ class GenericRapidJsonArrayValueIterator; template class GenericRapidJsonObjectMemberIterator; +/// Container for a property name and an associated RapidJson value template class GenericRapidJsonObjectMember : public std::pair > @@ -854,8 +855,8 @@ typedef GenericRapidJsonObjectMemberIterator<> RapidJsonObjectMemberIterator; typedef GenericRapidJsonValue<> RapidJsonValue; /** - * RapidJson specialisation of the AdapterTraits template struct, used - * primarily for producing better error messages in tests. + * @brief Specialisation of the AdapterTraits template struct for a + * RapidJsonAdapter that uses a pool allocator */ template<> struct AdapterTraits @@ -868,9 +869,15 @@ struct AdapterTraits } }; +typedef rapidjson::GenericValue, rapidjson::CrtAllocator> + RapidJsonCrt; + +/** + * @brief Specialisation of the AdapterTraits template struct for a + * RapidJsonAdapter that uses the default CRT allocator + */ template<> -struct AdapterTraits, rapidjson::CrtAllocator> > > +struct AdapterTraits > { typedef rapidjson::GenericDocument, rapidjson::CrtAllocator> DocumentType; diff --git a/include/valijson/constraints/constraint_visitor.hpp b/include/valijson/constraints/constraint_visitor.hpp index 57124c3..f575dbc 100644 --- a/include/valijson/constraints/constraint_visitor.hpp +++ b/include/valijson/constraints/constraint_visitor.hpp @@ -28,6 +28,7 @@ struct RequiredConstraint; struct TypeConstraint; struct UniqueItemsConstraint; +/// Interface to allow usage of the visitor pattern with Constraints class ConstraintVisitor { protected: