GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-18 02:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace TINYGLTF_USE_NO_EXCEPT with GNU compiler version check

Browse Source
This commit is contained in:
Selmar Kok 2019-10-29 16:22:07 +01:00
parent e3cf5edb94
commit 79e3df26a8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tiny_gltf.h
View File

@ -67,11 +67,16 @@
#endif #endif
#endif #endif
#if TINYGLTF_USE_NOEXECEPT #ifdef __GNUC__
#define TINYGLTF_NOEXCEPT noexcept #if (__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8))
#else
#define TINYGLTF_NOEXCEPT #define TINYGLTF_NOEXCEPT
#else
#define TINYGLTF_NOEXCEPT noexcept
#endif #endif
#else
#define TINYGLTF_NOEXCEPT noexcept
#endif
#define DEFAULT_METHODS(x) \ #define DEFAULT_METHODS(x) \
~x() = default; \ ~x() = default; \
x(const x&) = default; \ x(const x&) = default; \
@ -4209,6 +4214,7 @@ static bool ParseMaterial(Material *material, std::string *err, const json &o) {
} }
} }
/* ASOBO_MOD:: do not read these values, because they are not serialized and will make Material::operator==() return false after serialize/parse/compare
// Old code path. For backward compatibility, we still store material values // Old code path. For backward compatibility, we still store material values
// as Parameter. This will create duplicated information for // as Parameter. This will create duplicated information for
// example(pbrMetallicRoughness), but should be neglible in terms of memory // example(pbrMetallicRoughness), but should be neglible in terms of memory
@ -4250,6 +4256,7 @@ static bool ParseMaterial(Material *material, std::string *err, const json &o) {
} }
} }
} }
*/ //::ASOBO_MOD
material->extensions.clear(); material->extensions.clear();
ParseExtensionsProperty(&material->extensions, err, o); ParseExtensionsProperty(&material->extensions, err, o);