diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-02 14:32:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 14:32:06 +0200 |
| commit | 0b73a9e403a99af7c909908866d2b7822ddf3d44 (patch) | |
| tree | 2a52e9e530d0fd9c93ae9c5ffa5ea8055b064087 /platform | |
| parent | 0f4c30fb7166e84d93f0b2cb20d726f869155d98 (diff) | |
| parent | c026e3957a815199ee301cdcbaa94698ee4a3705 (diff) | |
Merge pull request #22618 from akien-mga/fix-warnings
Fix warnings on virtual methods [-Woverloaded-virtual] [-Wdelete-non-…
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/haiku/context_gl_haiku.h | 6 | ||||
| -rw-r--r-- | platform/uwp/gl_context_egl.h | 6 | ||||
| -rw-r--r-- | platform/windows/context_gl_win.h | 2 | ||||
| -rw-r--r-- | platform/x11/context_gl_x11.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/platform/haiku/context_gl_haiku.h b/platform/haiku/context_gl_haiku.h index 74f09984f2..2c20570a8d 100644 --- a/platform/haiku/context_gl_haiku.h +++ b/platform/haiku/context_gl_haiku.h @@ -46,9 +46,6 @@ private: bool use_vsync; public: - ContextGL_Haiku(HaikuDirectWindow *p_window); - ~ContextGL_Haiku(); - virtual Error initialize(); virtual void release_current(); virtual void make_current(); @@ -58,6 +55,9 @@ public: virtual void set_use_vsync(bool p_use); virtual bool is_using_vsync() const; + + ContextGL_Haiku(HaikuDirectWindow *p_window); + virtual ~ContextGL_Haiku(); }; #endif diff --git a/platform/uwp/gl_context_egl.h b/platform/uwp/gl_context_egl.h index 3e3c4a0f57..3c7115cc34 100644 --- a/platform/uwp/gl_context_egl.h +++ b/platform/uwp/gl_context_egl.h @@ -71,8 +71,8 @@ public: virtual int get_window_height(); virtual void swap_buffers(); - void set_use_vsync(bool use) { vsync = use; } - bool is_using_vsync() const { return vsync; } + virtual void set_use_vsync(bool use) { vsync = use; } + virtual bool is_using_vsync() const { return vsync; } virtual Error initialize(); void reset(); @@ -80,7 +80,7 @@ public: void cleanup(); ContextEGL(CoreWindow ^ p_window, Driver p_driver); - ~ContextEGL(); + virtual ~ContextEGL(); }; #endif diff --git a/platform/windows/context_gl_win.h b/platform/windows/context_gl_win.h index af2f89568e..5bcdb433b3 100644 --- a/platform/windows/context_gl_win.h +++ b/platform/windows/context_gl_win.h @@ -69,7 +69,7 @@ public: virtual bool is_using_vsync() const; ContextGL_Win(HWND hwnd, bool p_opengl_3_context); - ~ContextGL_Win(); + virtual ~ContextGL_Win(); }; #endif diff --git a/platform/x11/context_gl_x11.h b/platform/x11/context_gl_x11.h index ab0379a2fe..be3083d957 100644 --- a/platform/x11/context_gl_x11.h +++ b/platform/x11/context_gl_x11.h @@ -79,7 +79,7 @@ public: virtual bool is_using_vsync() const; ContextGL_X11(::Display *p_x11_display, ::Window &p_x11_window, const OS::VideoMode &p_default_video_mode, ContextType p_context_type); - ~ContextGL_X11(); + virtual ~ContextGL_X11(); }; #endif |