Commit 3574c614 by Corentin Wallez

Fix warnings caused by gmock on linux

When mocking functions gmock uses the keyword virtual instead of override and this conflicted with our usage of override for the destructor (there is a warning for using all one or the other). BUG= Change-Id: I9dd9204d5755dd3a588a32d438de3c1018ba07cd Reviewed-on: https://chromium-review.googlesource.com/291630Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent b44440d8
......@@ -18,7 +18,7 @@ namespace rx
class MockImageImpl : public ImageImpl
{
public:
~MockImageImpl() override { destructor(); }
virtual ~MockImageImpl() { destructor(); }
MOCK_METHOD0(initialize, egl::Error(void));
MOCK_METHOD1(orphan, gl::Error(egl::ImageSibling *));
MOCK_METHOD0(destructor, void());
......
......@@ -20,7 +20,7 @@ namespace rx
class MockRenderbufferImpl : public RenderbufferImpl
{
public:
~MockRenderbufferImpl() override { destructor(); }
virtual ~MockRenderbufferImpl() { destructor(); }
MOCK_METHOD3(setStorage, gl::Error(GLenum, size_t, size_t));
MOCK_METHOD4(setStorageMultisample, gl::Error(size_t, GLenum, size_t, size_t));
MOCK_METHOD1(setStorageEGLImageTarget, gl::Error(egl::Image *));
......
......@@ -19,7 +19,7 @@ namespace rx
class MockTextureImpl : public TextureImpl
{
public:
~MockTextureImpl() override { destructor(); }
virtual ~MockTextureImpl() { destructor(); }
MOCK_METHOD1(setUsage, void(GLenum));
MOCK_METHOD8(setImage, gl::Error(GLenum, size_t, GLenum, const gl::Extents &, GLenum, GLenum, const gl::PixelUnpackState &, const uint8_t *));
MOCK_METHOD7(setSubImage, gl::Error(GLenum, size_t, const gl::Box &, GLenum, GLenum, const gl::PixelUnpackState &, const uint8_t *));
......
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