Skip to content

Commit

Permalink
Adds GenericDocument::ParseStream() overload to make SourceEncoding o…
Browse files Browse the repository at this point in the history
  • Loading branch information
miloyip committed Jun 24, 2014
1 parent 02673be commit 84f64ba
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions include/rapidjson/document.h
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,11 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
return *this;
}

template <unsigned parseFlags, typename InputStream>
GenericDocument& ParseStream(InputStream& is) {
return ParseStream<parseFlags, Encoding, InputStream>(is);
}

//! Parse JSON text from a mutable string.
/*! \tparam parseFlags Combination of ParseFlag.
\param str Mutable zero-terminated string to be parsed.
Expand Down

2 comments on commit 84f64ba

@pah
Copy link
Contributor

@pah pah commented on 84f64ba Jun 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@miloyip: If you add patches proposed by me, please apply them via git am or wait until I open a "real" pull-request against your new upstream repository. It would be polite to keep the author attribution in the development history. I'll try to submit my patches via GitHub in the coming days. Thanks!

@miloyip
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pah: I tried to see how to merge your changes but with no luck. Looking forward to see your patches. I will work on other issues at the moment.

Please sign in to comment.