Add encoding validation option for Writer/PrettyWriter

1 files changed, 7 insertions, 3 deletions

diff --git a/include/rapidjson/prettywriter.h b/include/rapidjson/prettywriter.h
index adfff4fd..dd0e516d 100644
--- a/include/rapidjson/prettywriter.h
+++ b/include/rapidjson/prettywriter.h
@@ -31,8 +31,8 @@ RAPIDJSON_NAMESPACE_BEGIN
     \tparam TargetEncoding Encoding of output stream.

     \tparam StackAllocator Type of allocator for allocating memory of stack.

 */

-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>

-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> {

+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>

+class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {

 public:

     typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;

     typedef typename Base::Ch Ch;

@@ -42,9 +42,13 @@ public:
         \param allocator User supplied allocator. If it is null, it will create a private one.

         \param levelDepth Initial capacity of stack.

     */

-    PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 

+    explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 

         Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}

 

+

+    explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 

+        Base(allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}

+

     //! Set custom indentation.

     /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').

         \param indentCharCount  Number of indent characters for each indentation level.