diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h index 9645e9b..289a224 100644 --- a/include/rapidjson/internal/dtoa.h +++ b/include/rapidjson/internal/dtoa.h @@ -45,7 +45,7 @@ RAPIDJSON_DIAG_OFF(effc++) struct DiyFp { DiyFp() {} - DiyFp(uint64_t f, int e) : f(f), e(e) {} + DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {} DiyFp(double d) { union { diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h index fdade6e..02d6680 100644 --- a/include/rapidjson/writer.h +++ b/include/rapidjson/writer.h @@ -59,12 +59,14 @@ public: //! Constructor /*! \param os Output stream. - \param allocator User supplied allocator. If it is null, it will create a private one. + \param stackAllocator User supplied allocator. If it is null, it will create a private one. \param levelDepth Initial capacity of stack. */ + explicit Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), hasRoot_(false) {} + explicit Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) : os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), hasRoot_(false) {}