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

Merge pull request #13 from pah/fixes/107

Browse Source 
GenericDocument::ParseStream: make SourceEncoding optional
This commit is contained in:
Milo Yip 2014-06-25 23:23:00 +08:00
commit a56a051737
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/rapidjson/document.h
View File

@ -734,6 +734,11 @@ public:
return *this; return *this;
} }
template <unsigned parseFlags, typename InputStream>
GenericDocument& ParseStream(InputStream& is) {
return ParseStream<parseFlags,Encoding,InputStream>(is);
}
//! Parse JSON text from a mutable string. //! Parse JSON text from a mutable string.
/*! \tparam parseFlags Combination of ParseFlag. /*! \tparam parseFlags Combination of ParseFlag.
\param str Mutable zero-terminated string to be parsed. \param str Mutable zero-terminated string to be parsed.