From 69c152d7c130e96287eada4467611322f8bd64ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Ubi=C3=B1as?= <reubinas@gmail.com>
Date: Wed, 11 Aug 2021 18:57:21 -0400
Subject: [PATCH 1/3] Add missing diagnostic push

---
 code/AssetLib/glTF/glTFExporter.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/AssetLib/glTF/glTFExporter.cpp b/code/AssetLib/glTF/glTFExporter.cpp
index 810263f52..10943905c 100644
--- a/code/AssetLib/glTF/glTFExporter.cpp
+++ b/code/AssetLib/glTF/glTFExporter.cpp
@@ -526,6 +526,7 @@ void ExportSkin(Asset& mAsset, const aiMesh* aimesh, Ref<Mesh>& meshRef, Ref<Buf
 
 #if defined(__has_warning)
 #if __has_warning("-Wunused-but-set-variable")
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
 #endif

From 58cae73401602a7ea8aaf61682a6215b8cdd25c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Ubi=C3=B1as?= <reubinas@gmail.com>
Date: Wed, 11 Aug 2021 19:32:26 -0400
Subject: [PATCH 2/3] Disable diagnostic for LogStream comparator

---
 code/Common/Assimp.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp
index ca0912979..3a0ec7d60 100644
--- a/code/Common/Assimp.cpp
+++ b/code/Common/Assimp.cpp
@@ -72,12 +72,25 @@ namespace Assimp {
 // underlying structure for aiPropertyStore
 typedef BatchLoader::PropertyMap PropertyMap;
 
+#if defined(__has_warning)
+#if __has_warning("-Wordered-compare-function-pointers")
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wordered-compare-function-pointers"
+#endif
+#endif
+
 /** Stores the LogStream objects for all active C log streams */
 struct mpred {
     bool operator()(const aiLogStream &s0, const aiLogStream &s1) const {
         return s0.callback < s1.callback && s0.user < s1.user;
     }
 };
+
+#if defined(__has_warning)
+#if __has_warning("-Wordered-compare-function-pointers")
+#pragma GCC diagnostic pop
+#endif
+#endif
 typedef std::map<aiLogStream, Assimp::LogStream *, mpred> LogStreamMap;
 
 /** Stores the LogStream objects allocated by #aiGetPredefinedLogStream */

From b95df54225c0406290143d0d4ed08d7439420652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Ubi=C3=B1as?= <reubinas@gmail.com>
Date: Wed, 11 Aug 2021 19:33:10 -0400
Subject: [PATCH 3/3] Remove unused code

---
 contrib/openddlparser/code/OpenDDLExport.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/openddlparser/code/OpenDDLExport.cpp b/contrib/openddlparser/code/OpenDDLExport.cpp
index 6d6f2458d..d235b553b 100644
--- a/contrib/openddlparser/code/OpenDDLExport.cpp
+++ b/contrib/openddlparser/code/OpenDDLExport.cpp
@@ -134,10 +134,9 @@ bool OpenDDLExport::writeToStream(const std::string &statement) {
 }
 
 bool OpenDDLExport::writeNode(DDLNode *node, std::string &statement) {
-    bool success(true);
     writeNodeHeader(node, statement);
     if (node->hasProperties()) {
-        success |= writeProperties(node, statement);
+        writeProperties(node, statement);
     }
     writeLineEnd(statement);