From 5a96c1f93e01f021d89536452a2357cdd54c4f3d Mon Sep 17 00:00:00 2001 From: Anton Indrawan Date: Sun, 23 Nov 2014 21:03:57 +0100 Subject: [PATCH] Compile all examples with the Dinkum C++ of QNX 6.6 QCC -Wall -Wextra -Vgcc_ntoarmv7le -I../include --- example/tutorial/tutorial.cpp | 1 + include/rapidjson/filereadstream.h | 4 ++-- include/rapidjson/filestream.h | 4 ++-- include/rapidjson/filewritestream.h | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/example/tutorial/tutorial.cpp b/example/tutorial/tutorial.cpp index b72db00..57f94a5 100644 --- a/example/tutorial/tutorial.cpp +++ b/example/tutorial/tutorial.cpp @@ -7,6 +7,7 @@ #include using namespace rapidjson; +using namespace std; int main(int, char*[]) { //////////////////////////////////////////////////////////////////////////// diff --git a/include/rapidjson/filereadstream.h b/include/rapidjson/filereadstream.h index ea46dac..4ff4ab9 100644 --- a/include/rapidjson/filereadstream.h +++ b/include/rapidjson/filereadstream.h @@ -40,7 +40,7 @@ public: \param buffer user-supplied buffer. \param bufferSize size of buffer in bytes. Must >=4 bytes. */ - FileReadStream(FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { + FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { RAPIDJSON_ASSERT(fp_ != 0); RAPIDJSON_ASSERT(bufferSize >= 4); Read(); @@ -79,7 +79,7 @@ private: } } - FILE* fp_; + std::FILE* fp_; Ch *buffer_; size_t bufferSize_; Ch *bufferLast_; diff --git a/include/rapidjson/filestream.h b/include/rapidjson/filestream.h index a4f559c..a2e7172 100644 --- a/include/rapidjson/filestream.h +++ b/include/rapidjson/filestream.h @@ -36,7 +36,7 @@ class FileStream { public: typedef char Ch; //!< Character type. Only support char. - FileStream(FILE* fp) : fp_(fp), current_('\0'), count_(0) { Read(); } + FileStream(std::FILE* fp) : fp_(fp), current_('\0'), count_(0) { Read(); } char Peek() const { return current_; } char Take() { char c = current_; Read(); return c; } size_t Tell() const { return count_; } @@ -63,7 +63,7 @@ private: current_ = '\0'; } - FILE* fp_; + std::FILE* fp_; char current_; size_t count_; }; diff --git a/include/rapidjson/filewritestream.h b/include/rapidjson/filewritestream.h index cecd700..2f4977d 100644 --- a/include/rapidjson/filewritestream.h +++ b/include/rapidjson/filewritestream.h @@ -34,7 +34,7 @@ class FileWriteStream { public: typedef char Ch; //!< Character type. Only support char. - FileWriteStream(FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { + FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { RAPIDJSON_ASSERT(fp_ != 0); } @@ -80,7 +80,7 @@ private: FileWriteStream(const FileWriteStream&); FileWriteStream& operator=(const FileWriteStream&); - FILE* fp_; + std::FILE* fp_; char *buffer_; char *bufferEnd_; char *current_;