From fa7257fe92d72d6f198bb234f7af73026b2cb33e Mon Sep 17 00:00:00 2001 From: brunoherbelin Date: Sun, 13 Sep 2020 17:44:40 +0200 Subject: [PATCH] Compilation warnings --- RenderingManager.h | 5 +++-- Resource.cpp | 1 - SessionVisitor.cpp | 2 +- Shader.h | 1 + UpdateCallback.cpp | 4 ++-- UserInterfaceManager.cpp | 2 -- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/RenderingManager.h b/RenderingManager.h index f231e75..8e6aff5 100644 --- a/RenderingManager.h +++ b/RenderingManager.h @@ -10,8 +10,9 @@ #include "Screenshot.h" -class GLFWmonitor; -class GLFWwindow; + +typedef struct GLFWmonitor GLFWmonitor; +typedef struct GLFWwindow GLFWwindow; class FrameBuffer; struct RenderingAttrib diff --git a/Resource.cpp b/Resource.cpp index 9b187b3..d7a6e20 100644 --- a/Resource.cpp +++ b/Resource.cpp @@ -265,7 +265,6 @@ std::string Resource::listDirectory() { // enter icons directory auto fs = cmrc::vmix::get_filesystem(); - cmrc::file file; cmrc::directory_iterator it = fs.iterate_directory(""); cmrc::directory_iterator itend = it.end(); diff --git a/SessionVisitor.cpp b/SessionVisitor.cpp index 9e72582..5da765d 100644 --- a/SessionVisitor.cpp +++ b/SessionVisitor.cpp @@ -19,7 +19,7 @@ using namespace tinyxml2; SessionVisitor::SessionVisitor(tinyxml2::XMLDocument *doc, tinyxml2::XMLElement *root, - bool recursive) : Visitor(), xmlCurrent_(root), recursive_(recursive) + bool recursive) : Visitor(), recursive_(recursive), xmlCurrent_(root) { if (doc == nullptr) xmlDoc_ = new XMLDocument; diff --git a/Shader.h b/Shader.h index 3024dc3..9ca3277 100644 --- a/Shader.h +++ b/Shader.h @@ -41,6 +41,7 @@ class Shader public: Shader(); + virtual ~Shader() {} // unique identifyer generated at instanciation inline int id () const { return id_; } diff --git a/UpdateCallback.cpp b/UpdateCallback.cpp index 161e78d..65d63ae 100644 --- a/UpdateCallback.cpp +++ b/UpdateCallback.cpp @@ -12,7 +12,7 @@ UpdateCallback::UpdateCallback() : enabled_(true), finished_(false) } MoveToCallback::MoveToCallback(glm::vec3 target, float duration) : UpdateCallback(), - target_(target), duration_(duration), progress_(0.f), initialized_(false) + duration_(duration), progress_(0.f), initialized_(false), target_(target) { } @@ -40,7 +40,7 @@ void MoveToCallback::update(Node *n, float dt) } RotateToCallback::RotateToCallback(float target, float duration) : UpdateCallback(), - target_(target), duration_(duration), progress_(0.f), initialized_(false) + duration_(duration), progress_(0.f), initialized_(false), target_(target) { } diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp index 49edf89..c567e5f 100644 --- a/UserInterfaceManager.cpp +++ b/UserInterfaceManager.cpp @@ -2248,8 +2248,6 @@ namespace ImGui int hover(const char *label) { const ImGuiStyle& Style = GetStyle(); - const ImGuiIO& IO = GetIO(); - ImDrawList* DrawList = GetWindowDrawList(); ImGuiWindow* Window = GetCurrentWindow(); if (Window->SkipItems) return 0;