Commit 541591d5 by Corentin Wallez Committed by Commit Bot

Fix some override related warnings.

BUG= Change-Id: I9e67ba2165ac87959f319fd2485fe385c60a8ea0 Reviewed-on: https://chromium-review.googlesource.com/324461Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 07fd1aaa
...@@ -33,7 +33,7 @@ class ParticleSystemSample : public SampleApplication ...@@ -33,7 +33,7 @@ class ParticleSystemSample : public SampleApplication
{ {
} }
virtual bool initialize() bool initialize() override
{ {
const std::string vs = SHADER_SOURCE const std::string vs = SHADER_SOURCE
( (
...@@ -157,7 +157,7 @@ class ParticleSystemSample : public SampleApplication ...@@ -157,7 +157,7 @@ class ParticleSystemSample : public SampleApplication
glUniform1f(mTimeLoc, mParticleTime); glUniform1f(mTimeLoc, mParticleTime);
} }
virtual void draw() void draw() override
{ {
// Set the viewport // Set the viewport
glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight()); glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
......
...@@ -33,7 +33,7 @@ class FunctionsGLCGL : public FunctionsGL ...@@ -33,7 +33,7 @@ class FunctionsGLCGL : public FunctionsGL
public: public:
FunctionsGLCGL(void *dylibHandle) : mDylibHandle(dylibHandle) {} FunctionsGLCGL(void *dylibHandle) : mDylibHandle(dylibHandle) {}
virtual ~FunctionsGLCGL() { dlclose(mDylibHandle); } ~FunctionsGLCGL() override { dlclose(mDylibHandle); }
private: private:
void *loadProcAddress(const std::string &function) override void *loadProcAddress(const std::string &function) override
......
...@@ -42,9 +42,7 @@ class FunctionsGLGLX : public FunctionsGL ...@@ -42,9 +42,7 @@ class FunctionsGLGLX : public FunctionsGL
{ {
} }
virtual ~FunctionsGLGLX() ~FunctionsGLGLX() override {}
{
}
private: private:
void *loadProcAddress(const std::string &function) override void *loadProcAddress(const std::string &function) override
......
...@@ -37,9 +37,7 @@ class FunctionsGLWindows : public FunctionsGL ...@@ -37,9 +37,7 @@ class FunctionsGLWindows : public FunctionsGL
ASSERT(mGetProcAddressWGL); ASSERT(mGetProcAddressWGL);
} }
virtual ~FunctionsGLWindows() ~FunctionsGLWindows() override {}
{
}
private: private:
void *loadProcAddress(const std::string &function) override void *loadProcAddress(const std::string &function) override
......
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