Skip to content

Commit e4cfcba

Browse files
revmischaMischa
authored andcommitted
refactor: unhide base Init() in derived classes to fix virtual warning
1 parent b0148f3 commit e4cfcba

3 files changed

Lines changed: 13 additions & 2 deletions

File tree

src/libprojectM/Renderer/Backend/OpenGL/OpenGLCopyTexture.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ class OpenGLCopyTexture : public CopyTexture, public OpenGLRenderItem
2020
void InitVertexAttrib() override;
2121

2222
// Mark override for clarity and to avoid hiding warnings
23-
void Init() override { OpenGLRenderItem::Init(); }
23+
void Init() override
24+
{
25+
OpenGLRenderItem::Init();
26+
}
27+
28+
using OpenGLRenderItem::Init; // Unhide base Init() to avoid -Woverloaded-virtual warning
2429

2530
void Draw(const std::shared_ptr<class Texture>& originalTexture,
2631
bool flipVertical = false, bool flipHorizontal = false) override;

src/libprojectM/Renderer/Backend/OpenGL/OpenGLPresetTransition.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ class OpenGLPresetTransition : public PresetTransition, public OpenGLRenderItem
2222
void InitVertexAttrib() override;
2323

2424
// Mark override for clarity and to avoid hiding warnings
25-
void Init() override { OpenGLRenderItem::Init(); }
25+
void Init() override
26+
{
27+
OpenGLRenderItem::Init();
28+
}
29+
30+
using OpenGLRenderItem::Init; // Unhide base Init() to avoid -Woverloaded-virtual warning
2631

2732
void Draw(const Preset& oldPreset,
2833
const Preset& newPreset,

src/libprojectM/Renderer/Backend/OpenGL/OpenGLRenderItem.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class OpenGLRenderItem : public ::libprojectM::Renderer::RenderItem
2525
void Init() override;
2626

2727
protected:
28+
using ::libprojectM::Renderer::RenderItem::Init; // Unhide base Init() to avoid -Woverloaded-virtual warning
2829
GLuint m_vboID{0};
2930
GLuint m_vaoID{0};
3031
};

0 commit comments

Comments
 (0)