From bbc1eaeecff05455e2724f07ba5fdba1f1a7401a Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Sun, 3 Sep 2023 09:05:32 +1000 Subject: [PATCH] Fix msvc build -- STRICT is a msvc macro name --- tiny_gltf.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index 2b5f852..2c5b98c 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -196,8 +196,8 @@ typedef enum { } Type; typedef enum { - PERMISSIVE, - STRICT + Permissive, + Strict } ParseStrictness; static inline int32_t GetComponentSizeInBytes(uint32_t componentType) { @@ -1562,7 +1562,7 @@ class TinyGLTF { size_t bin_size_ = 0; bool is_binary_ = false; - ParseStrictness strictness_ = ParseStrictness::STRICT; + ParseStrictness strictness_ = ParseStrictness::Strict; bool serialize_default_values_ = false; ///< Serialize default values? @@ -5254,7 +5254,7 @@ static bool ParseMaterial(Material *material, std::string *err, std::string *war if (ParseNumberArrayProperty(&material->emissiveFactor, err, o, "emissiveFactor", /* required */ false)) { - if (strictness==ParseStrictness::PERMISSIVE && material->emissiveFactor.size() == 4) { + if (strictness==ParseStrictness::Permissive && material->emissiveFactor.size() == 4) { if (warn) { (*warn) += "Array length of `emissiveFactor` parameter in "