Merge remote-tracking branch 'origin/master' into issue120floatprecision

example/tutorial/tutorial.cpp

@@ -7,6 +7,7 @@
 #include <cstdio>
 
 using namespace rapidjson;
+using namespace std;
 
 int main(int, char*[]) {
     ////////////////////////////////////////////////////////////////////////////

include/rapidjson/document.h

@@ -1896,10 +1896,27 @@ template <typename SourceAllocator>
 inline
 GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator)
 {
+    switch (rhs.GetType()) {
+    case kObjectType:
+    case kArrayType: { // perform deep copy via SAX Handler
             GenericDocument<Encoding,Allocator> d(&allocator);
             rhs.Accept(d);
             RawAssign(*d.stack_.template Pop<GenericValue>(1));
         }
+        break;
+    case kStringType:
+        if (rhs.flags_ == kConstStringFlag) {
+            flags_ = rhs.flags_;
+            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+        } else {
+            SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
+        }
+        break;
+    default: // kNumberType, kTrueType, kFalseType, kNullType
+        flags_ = rhs.flags_;
+        data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+    }
+}
 
 RAPIDJSON_NAMESPACE_END
 

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_;

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_;
 };

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_;

test/unittest/stringbuffertest.cpp

@@ -76,7 +76,9 @@ TEST(StringBuffer, Pop) {
 TEST(StringBuffer, Traits) {
     static_assert( std::is_constructible<StringBuffer>::value, "");
     static_assert( std::is_default_constructible<StringBuffer>::value, "");
+#ifndef _MSC_VER
     static_assert(!std::is_copy_constructible<StringBuffer>::value, "");
+#endif
     static_assert( std::is_move_constructible<StringBuffer>::value, "");
 
     static_assert(!std::is_nothrow_constructible<StringBuffer>::value, "");
@@ -85,7 +87,9 @@ TEST(StringBuffer, Traits) {
     static_assert(!std::is_nothrow_move_constructible<StringBuffer>::value, "");
 
     static_assert( std::is_assignable<StringBuffer,StringBuffer>::value, "");
+#ifndef _MSC_VER
     static_assert(!std::is_copy_assignable<StringBuffer>::value, "");
+#endif
     static_assert( std::is_move_assignable<StringBuffer>::value, "");
 
     static_assert(!std::is_nothrow_assignable<StringBuffer,StringBuffer>::value, "");
@@ -93,7 +97,9 @@ TEST(StringBuffer, Traits) {
     static_assert(!std::is_nothrow_move_assignable<StringBuffer>::value, "");
 
     static_assert( std::is_destructible<StringBuffer>::value, "");
+#ifndef _MSC_VER
     static_assert(std::is_nothrow_destructible<StringBuffer>::value, "");
+#endif
 }
 
 TEST(StringBuffer, MoveConstructor) {