6 Commits (1558db0722011c134cb9946f9d1a15aac8e1c731)

Author	SHA1	Message	Date
Danke Xie	b2760abeb2	Fix compilation error for Mac OS X and 64-bit architecture ... For a 64-bit architecture, unsigned long and size_t are the same. This causes a compilation error due to duplicate constructors in document.h.	2016-01-02 01:29:47 -08:00
Kim Kulling	43be58bbfe	rapidjson: add apple-specific constructor with size_t.	2015-12-28 13:02:04 +01:00
Kim Kulling	22f7f60ba0	glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723	2015-12-27 20:36:54 +01:00
carlsonsolutiondesign	dd89bd3703	Only test for __APPLE__ here to avoid conflicts with Linux (and maybe Windows)	2015-12-17 17:02:06 -05:00
carlsonsolutiondesign	fa0427ca28	Copies the GenericValue(uint64_t) to a GenericValue(unsigned long) for compilation on Mac OS X 10.11.2. Not compiled on Windows yet. Will have to reboot and install Visual Studio or equivalent to compile, so I'm hoping someone else can look at the code and merge for Windows and Linux. Thanks!	2015-12-17 12:16:25 -05:00
Otger	64a020965f	Added RapidJSON to contrib	2015-11-26 02:33:39 +01:00