[Libreoffice-commits] core.git: 2 commits - vcl/opengl

[Stephan Bergmann]

 vcl/opengl/win/gdiimpl.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e5b927651de97f2f0fdeb3e7f4715eb40a0917d9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 25 08:26:57 2016 +0200

    -Werror,-Winconsistent-missing-override
    
    Change-Id: I15a8399d120450b01bd35c7ad974d3af749811ad

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 8be4bd6..4b3e836 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -41,8 +41,8 @@ public:
     virtual bool initWindow() override;
 private:
     GLWinWindow m_aGLWin;
-    virtual const GLWindow& getOpenGLWindow() const { return m_aGLWin; }
-    virtual GLWindow& getModifiableOpenGLWindow() { return m_aGLWin; }
+    virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
+    virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
     virtual bool ImplInit() override;
     virtual void makeCurrent() override;
     virtual void destroyCurrentContext() override;
commit 112d7c1d24ab786bfabdcfbd092718c8af392c7a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 25 08:25:50 2016 +0200

    Missing include
    
    Change-Id: I11a004458ac90db92f4bf9e54827b6727c5cbc67

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 1f6b044..8be4bd6 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -8,6 +8,7 @@
  */
 
 #include "opengl/win/gdiimpl.hxx"
+#include <opengl/zone.hxx>
 #include <o3tl/lru_map.hxx>
 #include <win/wincomp.hxx>
 #include <win/saldata.hxx>