Commit a588ef5b by Corentin Wallez

Fix most occurences of -Winconsistent-missing-override

Other occurences are in code generated by macro in googlemock. BUG=angleproject:892 Change-Id: I8b2c6ad4b793be2d9a440687b1b010c9feb8bdae Reviewed-on: https://chromium-review.googlesource.com/272224Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 4f691690
...@@ -17,7 +17,7 @@ class TranslatorESSL : public TCompiler ...@@ -17,7 +17,7 @@ class TranslatorESSL : public TCompiler
protected: protected:
void initBuiltInFunctionEmulator(BuiltInFunctionEmulator *emu, int compileOptions) override; void initBuiltInFunctionEmulator(BuiltInFunctionEmulator *emu, int compileOptions) override;
virtual void translate(TIntermNode *root, int compileOptions); void translate(TIntermNode *root, int compileOptions) override;
private: private:
void writeExtensionBehavior(); void writeExtensionBehavior();
......
...@@ -17,7 +17,7 @@ class TranslatorGLSL : public TCompiler ...@@ -17,7 +17,7 @@ class TranslatorGLSL : public TCompiler
protected: protected:
void initBuiltInFunctionEmulator(BuiltInFunctionEmulator *emu, int compileOptions) override; void initBuiltInFunctionEmulator(BuiltInFunctionEmulator *emu, int compileOptions) override;
virtual void translate(TIntermNode *root, int compileOptions); void translate(TIntermNode *root, int compileOptions) override;
private: private:
void writeVersion(TIntermNode *root); void writeVersion(TIntermNode *root);
......
...@@ -24,7 +24,7 @@ class PbufferSurfaceGLX : public SurfaceGL ...@@ -24,7 +24,7 @@ class PbufferSurfaceGLX : public SurfaceGL
glx::Context context, glx::FBConfig fbConfig); glx::Context context, glx::FBConfig fbConfig);
~PbufferSurfaceGLX() override; ~PbufferSurfaceGLX() override;
egl::Error initialize(); egl::Error initialize() override;
egl::Error makeCurrent() override; egl::Error makeCurrent() override;
egl::Error swap() override; egl::Error swap() override;
......
...@@ -23,7 +23,7 @@ class WindowSurfaceGLX : public SurfaceGL ...@@ -23,7 +23,7 @@ class WindowSurfaceGLX : public SurfaceGL
WindowSurfaceGLX(const FunctionsGLX &glx, Window window, Display *display, glx::Context context, glx::FBConfig fbConfig); WindowSurfaceGLX(const FunctionsGLX &glx, Window window, Display *display, glx::Context context, glx::FBConfig fbConfig);
~WindowSurfaceGLX() override; ~WindowSurfaceGLX() override;
egl::Error initialize(); egl::Error initialize() override;
egl::Error makeCurrent() override; egl::Error makeCurrent() override;
egl::Error swap() override; egl::Error swap() override;
......
...@@ -26,7 +26,7 @@ class PbufferSurfaceWGL : public SurfaceGL ...@@ -26,7 +26,7 @@ class PbufferSurfaceWGL : public SurfaceGL
const FunctionsWGL *functions); const FunctionsWGL *functions);
~PbufferSurfaceWGL() override; ~PbufferSurfaceWGL() override;
egl::Error initialize(); egl::Error initialize() override;
egl::Error makeCurrent() override; egl::Error makeCurrent() override;
egl::Error swap() override; egl::Error swap() override;
......
...@@ -24,7 +24,7 @@ class WindowSurfaceWGL : public SurfaceGL ...@@ -24,7 +24,7 @@ class WindowSurfaceWGL : public SurfaceGL
WindowSurfaceWGL(EGLNativeWindowType window, ATOM windowClass, int pixelFormat, HGLRC wglContext, const FunctionsWGL *functions); WindowSurfaceWGL(EGLNativeWindowType window, ATOM windowClass, int pixelFormat, HGLRC wglContext, const FunctionsWGL *functions);
~WindowSurfaceWGL() override; ~WindowSurfaceWGL() override;
egl::Error initialize(); egl::Error initialize() override;
egl::Error makeCurrent() override; egl::Error makeCurrent() override;
egl::Error swap() override; egl::Error swap() override;
......
...@@ -63,7 +63,7 @@ class EGLQueryContextTest : public testing::TestWithParam<PlatformParameters> ...@@ -63,7 +63,7 @@ class EGLQueryContextTest : public testing::TestWithParam<PlatformParameters>
EXPECT_TRUE(mSurface != EGL_NO_SURFACE); EXPECT_TRUE(mSurface != EGL_NO_SURFACE);
} }
virtual void TearDown() void TearDown() override
{ {
eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroyContext(mDisplay, mContext); eglDestroyContext(mDisplay, mContext);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment