Skip to content

R
rapidjson
Commit 2e114989 authored by Rodion Malinovsky's avatar Rodion Malinovsky
Browse files
Options

Fix the usage of the stack::GetAllocator

parent c7433dfc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
include/rapidjson/document.h
View file @ 2e114989
...@@ -1887,7 +1887,8 @@ public: ...@@ -1887,7 +1887,8 @@ public:
template <unsigned parseFlags, typename SourceEncoding, typename InputStream> template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
GenericDocument& ParseStream(InputStream& is) { GenericDocument& ParseStream(InputStream& is) {
ValueType::SetNull(); // Remove existing root if exist ValueType::SetNull(); // Remove existing root if exist
GenericReader<SourceEncoding, Encoding, StackAllocator> reader(&stack_.GetAllocator()); GenericReader<SourceEncoding, Encoding, StackAllocator> reader(
stack_.HasAllocator() ? &stack_.GetAllocator() : 0);
ClearStackOnExit scope(*this); ClearStackOnExit scope(*this);
parseResult_ = reader.template Parse<parseFlags>(is, *this); parseResult_ = reader.template Parse<parseFlags>(is, *this);
if (parseResult_) { if (parseResult_) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment