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

Refactoring: Remove GenericSchemaValiadator::nullOutputHandler_

Browse Source
This commit is contained in:
Milo Yip 2016-02-02 10:17:06 +08:00
parent 02ea9f9db6
commit ba7aa979a5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/rapidjson/schema.h
View File

@ -1540,7 +1540,7 @@ public:
: :
schemaDocument_(&schemaDocument), schemaDocument_(&schemaDocument),
root_(schemaDocument.GetRoot()), root_(schemaDocument.GetRoot()),
outputHandler_(nullOutputHandler_), outputHandler_(GetNullHandler()),
stateAllocator_(allocator), stateAllocator_(allocator),
ownStateAllocator_(0), ownStateAllocator_(0),
schemaStack_(allocator, schemaStackCapacity), schemaStack_(allocator, schemaStackCapacity),
@ -1764,7 +1764,7 @@ private:
: :
schemaDocument_(&schemaDocument), schemaDocument_(&schemaDocument),
root_(root), root_(root),
outputHandler_(nullOutputHandler_), outputHandler_(GetNullHandler()),
stateAllocator_(allocator), stateAllocator_(allocator),
ownStateAllocator_(0), ownStateAllocator_(0),
schemaStack_(allocator, schemaStackCapacity), schemaStack_(allocator, schemaStackCapacity),
@ -1882,11 +1882,15 @@ private:
Context& CurrentContext() { return *schemaStack_.template Top<Context>(); } Context& CurrentContext() { return *schemaStack_.template Top<Context>(); }
const Context& CurrentContext() const { return *schemaStack_.template Top<Context>(); } const Context& CurrentContext() const { return *schemaStack_.template Top<Context>(); }
static OutputHandler& GetNullHandler() {
static OutputHandler nullHandler;
return nullHandler;
}
static const size_t kDefaultSchemaStackCapacity = 1024; static const size_t kDefaultSchemaStackCapacity = 1024;
static const size_t kDefaultDocumentStackCapacity = 256; static const size_t kDefaultDocumentStackCapacity = 256;
const SchemaDocumentType* schemaDocument_; const SchemaDocumentType* schemaDocument_;
const SchemaType& root_; const SchemaType& root_;
OutputHandler nullOutputHandler_;
OutputHandler& outputHandler_; OutputHandler& outputHandler_;
StateAllocator* stateAllocator_; StateAllocator* stateAllocator_;
StateAllocator* ownStateAllocator_; StateAllocator* ownStateAllocator_;