Browse Source

Try to fix lexing issue with preproc w/r/t __has_warning

awr1 5 years ago
parent
commit
638369e995
1 changed files with 6 additions and 2 deletions
  1. 6 2
      code/AssetLib/glTF/glTFExporter.cpp

+ 6 - 2
code/AssetLib/glTF/glTFExporter.cpp

@@ -525,9 +525,11 @@ void ExportSkin(Asset& mAsset, const aiMesh* aimesh, Ref<Mesh>& meshRef, Ref<Buf
     delete[] vertexJointData;
     delete[] vertexJointData;
 }
 }
 
 
-#if defined(__has_warning) && __has_warning("-Wunused-but-set-variable")
+#if defined(__has_warning)
+#if __has_warning("-Wunused-but-set-variable")
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
 #endif
+#endif
 
 
 void glTFExporter::ExportMeshes()
 void glTFExporter::ExportMeshes()
 {
 {
@@ -797,9 +799,11 @@ void glTFExporter::ExportMeshes()
     }
     }
 }
 }
 
 
-#if defined(__has_warning) && __has_warning("-Wunused-but-set-variable")
+#if defined(__has_warning)
+#if __has_warning("-Wunused-but-set-variable")
 #pragma GCC diagnostic pop
 #pragma GCC diagnostic pop
 #endif
 #endif
+#endif
 
 
 /*
 /*
  * Export the root node of the node hierarchy.
  * Export the root node of the node hierarchy.