Ver Fonte

Merge branch 'master' of https://github.com/assimp/assimp

Kim Kulling há 9 anos atrás
pai
commit
d26187714d
1 ficheiros alterados com 2 adições e 0 exclusões
  1. 2 0
      contrib/rapidjson/include/rapidjson/document.h

+ 2 - 0
contrib/rapidjson/include/rapidjson/document.h

@@ -557,12 +557,14 @@ public:
             flags_ |= kIntFlag;
     }
 
+#if !defined(__x86_64__)
     //! 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
 #endif
 
     //! Constructor for double value.