diff --git a/Engine/source/core/stream/fileStream.h b/Engine/source/core/stream/fileStream.h index 11c65d886..fe7218b9d 100644 --- a/Engine/source/core/stream/fileStream.h +++ b/Engine/source/core/stream/fileStream.h @@ -39,6 +39,7 @@ public: BUFFER_INVALID = 0xffffffff // file offsets must all be less than this }; + typedef char Ch; //!< Character type. Only support char. public: FileStream(); // default constructor virtual ~FileStream(); // destructor @@ -60,6 +61,8 @@ public: virtual void close(); bool flush(); + //rjson compatibility + bool Flush() { return flush(); } FileStream* clone() const; protected: diff --git a/Engine/source/persistence/rapidjson/document.h b/Engine/source/persistence/rapidjson/document.h index d1b90eb0b..5493ea683 100644 --- a/Engine/source/persistence/rapidjson/document.h +++ b/Engine/source/persistence/rapidjson/document.h @@ -2391,7 +2391,7 @@ public: ParseErrorCode GetParseError() const { return parseResult_.Code(); } //! Get the position of last parsing error in input, 0 otherwise. - size_t GetErrorOffset() const { return parseResult_.Offset(); } + size_t GetErrorOffset() const { return parseResult_._Offset(); } //! Implicit conversion to get the last parse result #ifndef __clang // -Wdocumentation diff --git a/Engine/source/persistence/rapidjson/error/error.h b/Engine/source/persistence/rapidjson/error/error.h index 095966c5d..597f70be8 100644 --- a/Engine/source/persistence/rapidjson/error/error.h +++ b/Engine/source/persistence/rapidjson/error/error.h @@ -106,7 +106,6 @@ enum ParseErrorCode { struct ParseResult { //!! Unspecified boolean type typedef bool (ParseResult::*BooleanType)() const; - private: ParseErrorCode code_; size_t offset_; diff --git a/Engine/source/persistence/rapidjson/reader.h b/Engine/source/persistence/rapidjson/reader.h index 44a6bcd30..2755e1bb8 100644 --- a/Engine/source/persistence/rapidjson/reader.h +++ b/Engine/source/persistence/rapidjson/reader.h @@ -683,7 +683,7 @@ public: ParseErrorCode GetParseErrorCode() const { return parseResult_.Code(); } //! Get the position of last parsing error in input, 0 otherwise. - size_t GetErrorOffset() const { return parseResult_.Offset(); } + size_t GetErrorOffset() const { return parseResult_._Offset(); } protected: void SetParseError(ParseErrorCode code, size_t offset) { parseResult_.Set(code, offset); }