From 2f58e8ec8ea34d1604a6742f9a09160d47838ed6 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 22 Jul 2022 14:27:45 +0200
Subject: [PATCH] Remove some more warnings

---
 include/openspace/engine/openspaceengine.h        |  2 +-
 include/openspace/rendering/framebufferrenderer.h |  5 ++---
 modules/skybrowser/ext/tinyxml2/tinyxml2.cpp      | 11 +++++++++++
 src/rendering/screenspacerenderable.cpp           |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 83b6209b01..6bd1de4781 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -78,7 +78,7 @@ public:
     };
 
     OpenSpaceEngine();
-    ~OpenSpaceEngine();
+    ~OpenSpaceEngine() override;
 
     void registerPathTokens();
     void initialize();
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index 5e80373e98..432b513ef2 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -54,11 +54,10 @@ struct RaycasterTask;
 class Scene;
 struct UpdateStructures;
 
-class FramebufferRenderer : public RaycasterListener,
-                            public DeferredcasterListener
+class FramebufferRenderer final : public RaycasterListener, public DeferredcasterListener
 {
 public:
-    virtual ~FramebufferRenderer() override final = default;
+    virtual ~FramebufferRenderer() override = default;
 
     void initialize();
     void deinitialize();
diff --git a/modules/skybrowser/ext/tinyxml2/tinyxml2.cpp b/modules/skybrowser/ext/tinyxml2/tinyxml2.cpp
index 4804cd5ece..cb04585ff2 100644
--- a/modules/skybrowser/ext/tinyxml2/tinyxml2.cpp
+++ b/modules/skybrowser/ext/tinyxml2/tinyxml2.cpp
@@ -28,6 +28,13 @@ distribution.
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wsuggest-override"
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+
 #include "tinyxml2.h"
 
 #include <new>		// yes, this one new style header, is in the Android SDK.
@@ -2995,3 +3002,7 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 5c8c356e3c..b546c1f4ab 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -285,6 +285,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         glm::vec3(glm::pi<float>())
     )
     , _scale(ScaleInfo, 0.25f, 0.f, 2.f)
+    , _gamma(GammaInfo, 1.f, 0.000001f, 10.f)
     , _multiplyColor(MultiplyColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _backgroundColor(
         BackgroundColorInfo,
@@ -295,7 +296,6 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
     , _fade(FadeInfo, 1.f, 0.f, 1.f)
     , _delete(DeleteInfo)
-    , _gamma(GammaInfo, 1.f, 0.000001f, 10.f)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);