generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-12 18:20:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31 from nicolas800/master

Browse Source 
Using std::function instead of function pointer in type FunctionPtrs
This commit is contained in:
Tristan Penman 2016-09-12 20:54:54 -07:00 committed by GitHub
commit 60eba9d391
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/valijson/schema_parser.hpp
View File

@ -6,6 +6,7 @@
#include <iostream>
#include <vector>
#include <memory>
#include <functional>
#include <valijson/adapters/adapter.hpp>
#include <valijson/constraints/concrete_constraints.hpp>
@ -72,10 +73,10 @@ public:
DocumentType;
/// Templated function pointer type for fetching remote documents
typedef const DocumentType * (*FetchDoc)(const std::string &uri);
typedef std::function< const DocumentType* (const std::string &uri) > FetchDoc ;
/// Templated function pointer type for freeing fetched documents
typedef void (*FreeDoc)(const DocumentType *);
typedef std::function< void (const DocumentType *)> FreeDoc ;
};
/**
@ -118,10 +119,10 @@ public:
void populateSchema(
const AdapterType &node,
Schema &schema,
typename FunctionPtrs<AdapterType>::FetchDoc fetchDoc = NULL,
typename FunctionPtrs<AdapterType>::FreeDoc freeDoc = NULL)
typename FunctionPtrs<AdapterType>::FetchDoc fetchDoc = nullptr ,
typename FunctionPtrs<AdapterType>::FreeDoc freeDoc = nullptr )
{
if ((fetchDoc == NULL) ^ (freeDoc == NULL)) {
if ((fetchDoc == nullptr ) ^ (freeDoc == nullptr)) {
throw std::runtime_error(
"Remote document fetching cannot be enabled without both "
"fetch and free functions");