v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only test for __APPLE__ here to avoid conflicts with Linux (and maybe Windows)

pull/725/head
carlsonsolutiondesign 2015-12-17 17:02:06 -05:00
parent fa0427ca28
commit dd89bd3703
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/rapidjson/include/rapidjson/document.h
View File

@ -545,6 +545,7 @@ public:
flags_ |= kIntFlag; flags_ |= kIntFlag;
} }
#if defined(__APPLE__)
//! Constructor for unsigned long value. //! Constructor for unsigned long value.
explicit GenericValue(unsigned long u64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUint64Flag) { explicit GenericValue(unsigned long u64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUint64Flag) {
data_.n.u64 = u64; data_.n.u64 = u64;
@ -555,6 +556,7 @@ public:
if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000))) if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
flags_ |= kIntFlag; flags_ |= kIntFlag;
} }
#endif
//! Constructor for double value. //! Constructor for double value.
explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberDoubleFlag) { data_.n.d = d; } explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberDoubleFlag) { data_.n.d = d; }