rapidjson: add apple-specific constructor with size_t.
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 28 Dec 2015 12:02:04 +0000 (13:02 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 28 Dec 2015 12:02:04 +0000 (13:02 +0100)
contrib/rapidjson/include/rapidjson/document.h

index f92a2a7..4c94555 100644 (file)
@@ -513,19 +513,12 @@ public:
             flags_ |= kUintFlag | kUint64Flag;
     }
 
-    //! Constructor for size_t value.
-    explicit GenericValue( size_t u ) RAPIDJSON_NOEXCEPT : data_(), flags_( kNumberUintFlag ) {
-        data_.n.u64 = u;
-        if ( !( u&0x80000000 ) )
-            flags_ |= kIntFlag|kInt64Flag;
-    }
-
     //! Constructor for unsigned value.
-/*    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUintFlag) {
+    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUintFlag) {
         data_.n.u64 = u; 
         if (!(u & 0x80000000))
             flags_ |= kIntFlag | kInt64Flag;
-    }*/
+    }
 
     //! Constructor for int64_t value.
     explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberInt64Flag) {
@@ -563,6 +556,13 @@ public:
         if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
             flags_ |= kIntFlag;
     }
+
+    //! Constructor for size_t value.
+    explicit GenericValue( size_t u ) RAPIDJSON_NOEXCEPT : data_(), flags_( kNumberUintFlag ) {
+        data_.n.u64 = u;
+        if ( !( u&0x80000000 ) )
+            flags_ |= kIntFlag|kInt64Flag;
+    }
 #endif
 
     //! Constructor for double value.