From 43be58bbfe01981ed271a5d65f1e49d05adf89b9 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 28 Dec 2015 13:02:04 +0100 Subject: [PATCH] rapidjson: add apple-specific constructor with size_t. --- contrib/rapidjson/include/rapidjson/document.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/rapidjson/include/rapidjson/document.h b/contrib/rapidjson/include/rapidjson/document.h index f92a2a70b..4c94555b7 100644 --- a/contrib/rapidjson/include/rapidjson/document.h +++ b/contrib/rapidjson/include/rapidjson/document.h @@ -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.