Merge pull request #450 from nyalldawson/fix_win

Fix msvc build -- STRICT is a msvc macro name
syoyo · Sep 6, 2023 · fe6a182 · fe6a182
2 parents 62cc925 + bbc1eae
commit fe6a182
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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?
 
@@ -5059,6 +5059,7 @@ static bool ParsePrimitive(Primitive *primitive, Model *model,
 #else
   (void)model;
   (void)warn;
+  (void)strictness;
 #endif
 
   return true;
@@ -5253,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 "