From d3f3c4a9dee13fc8dffcfff2c4ea4e44953d0f89 Mon Sep 17 00:00:00 2001 From: "Jablonski, Mateusz" Date: Thu, 12 Mar 2020 09:45:33 +0100 Subject: [PATCH] Remove redundant virtual keywords Change-Id: Ib303290dd5e4ce723eeb3670d6a3ceb8019cabd3 Signed-off-by: Jablonski, Mateusz --- opencl/test/unit_test/api/cl_api_tests.h | 4 ++-- .../unit_test/command_queue/enqueue_copy_buffer_fixture.h | 4 ++-- .../command_queue/enqueue_copy_buffer_rect_fixture.h | 4 ++-- .../command_queue/enqueue_copy_buffer_to_image_fixture.h | 8 ++++---- .../unit_test/command_queue/enqueue_copy_image_fixture.h | 6 +++--- .../command_queue/enqueue_copy_image_to_buffer_fixture.h | 8 ++++---- .../unit_test/command_queue/enqueue_fill_image_fixture.h | 4 ++-- .../unit_test/command_queue/enqueue_read_image_fixture.h | 4 ++-- .../unit_test/command_queue/enqueue_write_image_fixture.h | 4 ++-- opencl/test/unit_test/global_environment.h | 4 ++-- .../unit_test/mocks/mock_builtin_dispatch_info_builder.h | 2 +- .../unit_test/os_interface/windows/os_time_win_tests.cpp | 4 ++-- opencl/test/unit_test/perf_tests/api/api_tests.h | 4 ++-- shared/test/unit_test/test_macros/test.h | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index 694f37712e..9ada02289d 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -85,10 +85,10 @@ struct ApiFixture : PlatformFixture { struct api_tests : public ApiFixture<>, public ::testing::Test { - virtual void SetUp() override { + void SetUp() override { ApiFixture::SetUp(); } - virtual void TearDown() override { + void TearDown() override { ApiFixture::TearDown(); } }; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h index 09f73dddfc..3a49eba65a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h @@ -50,7 +50,7 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture, : srcBuffer(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext; @@ -59,7 +59,7 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture, dstBuffer = BufferHelper<>::create(); } - virtual void TearDown(void) override { + void TearDown(void) override { delete srcBuffer; delete dstBuffer; delete BufferDefaults::context; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h index ffc3d93b53..c00106998a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h @@ -61,7 +61,7 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture, static const size_t sizeInBytes; }; - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext; @@ -69,7 +69,7 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture, dstBuffer = BufferHelper::create(); } - virtual void TearDown(void) override { + void TearDown(void) override { delete srcBuffer; delete dstBuffer; delete BufferDefaults::context; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h index 78e6c71349..d973191e5d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h @@ -24,7 +24,7 @@ struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture, dstImage(nullptr) { } - virtual void SetUp(void) override { + void SetUp() override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext(pClDevice); @@ -33,7 +33,7 @@ struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture, dstImage = Image2dHelper<>::create(context); } - virtual void TearDown(void) override { + void TearDown() override { delete dstImage; delete srcBuffer; delete BufferDefaults::context; @@ -64,14 +64,14 @@ struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture, EnqueueCopyBufferToImageMipMapTest() : srcBuffer(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext(pClDevice); context = new MockContext(pClDevice); srcBuffer = BufferHelper<>::create(context); } - virtual void TearDown(void) override { + void TearDown(void) override { delete srcBuffer; delete BufferDefaults::context; delete context; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h index 1cc10a30f2..a015018747 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h @@ -24,14 +24,14 @@ struct EnqueueCopyImageTest : public CommandEnqueueFixture, dstImage(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); context = new MockContext(pClDevice); srcImage = Image2dHelper<>::create(context); dstImage = Image2dHelper<>::create(context); } - virtual void TearDown(void) override { + void TearDown(void) override { delete dstImage; delete srcImage; delete context; @@ -63,7 +63,7 @@ struct EnqueueCopyImageMipMapTest : public CommandEnqueueFixture, context = new MockContext(pClDevice); } - virtual void TearDown(void) override { + void TearDown(void) override { delete context; CommandEnqueueFixture::TearDown(); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h index 540eaf0bfe..502cd0c70c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h @@ -24,7 +24,7 @@ struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture, dstBuffer(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext(pClDevice); context = new MockContext(pClDevice); @@ -32,7 +32,7 @@ struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture, dstBuffer = BufferHelper<>::create(context); } - virtual void TearDown(void) override { + void TearDown(void) override { delete srcImage; delete dstBuffer; delete BufferDefaults::context; @@ -63,14 +63,14 @@ struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture, EnqueueCopyImageToBufferMipMapTest() : dstBuffer(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); BufferDefaults::context = new MockContext(pClDevice); context = new MockContext(pClDevice); dstBuffer = BufferHelper<>::create(context); } - virtual void TearDown(void) override { + void TearDown(void) override { delete dstBuffer; delete BufferDefaults::context; delete context; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h index 74b1e553f5..ff3edd0caa 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h @@ -19,13 +19,13 @@ struct EnqueueFillImageTestFixture : public CommandEnqueueFixture { EnqueueFillImageTestFixture() : image(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); context = new MockContext(pClDevice); image = Image2dHelper<>::create(context); } - virtual void TearDown(void) override { + void TearDown(void) override { delete image; delete context; CommandEnqueueFixture::TearDown(); diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h index 483f0f34d8..46680cb8ec 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h @@ -26,7 +26,7 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture, srcImage(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); context = new MockContext(pClDevice); @@ -35,7 +35,7 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture, dstPtr = new float[imageDesc.image_width * imageDesc.image_height]; } - virtual void TearDown(void) override { + void TearDown(void) override { delete srcImage; delete[] dstPtr; delete context; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h index 1535967db1..5668cb6820 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h @@ -24,7 +24,7 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture, dstImage(nullptr) { } - virtual void SetUp(void) override { + void SetUp(void) override { CommandEnqueueFixture::SetUp(); context = new MockContext(pClDevice); @@ -34,7 +34,7 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture, srcPtr = new float[imageDesc.image_width * imageDesc.image_height]; } - virtual void TearDown(void) override { + void TearDown(void) override { delete dstImage; delete[] srcPtr; delete context; diff --git a/opencl/test/unit_test/global_environment.h b/opencl/test/unit_test/global_environment.h index 3e43a24dbe..8bb71ed7f7 100644 --- a/opencl/test/unit_test/global_environment.h +++ b/opencl/test/unit_test/global_environment.h @@ -21,9 +21,9 @@ class TestEnvironment : public ::testing::Environment { public: TestEnvironment(); - virtual void SetUp() override; + void SetUp() override; - virtual void TearDown() override; + void TearDown() override; virtual void fclPushDebugVars( MockCompilerDebugVars &newDebugVars); diff --git a/opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h b/opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h index a9cff2154d..51c0d4168d 100644 --- a/opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h +++ b/opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h @@ -42,7 +42,7 @@ class MockBuiltinDispatchInfoBuilder : public BuiltinDispatchInfoBuilder { failingArgIndex = index; } - virtual bool setExplicitArg(uint32_t argIndex, size_t argSize, const void *argVal, cl_int &err) const override { + bool setExplicitArg(uint32_t argIndex, size_t argSize, const void *argVal, cl_int &err) const override { err = (withFailureInjection && argIndex == failingArgIndex) ? CL_INVALID_ARG_VALUE : CL_SUCCESS; return false; } diff --git a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp index 57e60793f1..7b6ea95452 100644 --- a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp @@ -28,11 +28,11 @@ BOOL WINAPI QueryPerformanceCounterMock( struct OSTimeWinTest : public ::testing::Test { public: - virtual void SetUp() override { + void SetUp() override { osTime = std::unique_ptr(new MockOSTimeWin(nullptr)); } - virtual void TearDown() override { + void TearDown() override { } std::unique_ptr osTime; }; diff --git a/opencl/test/unit_test/perf_tests/api/api_tests.h b/opencl/test/unit_test/perf_tests/api/api_tests.h index 81d28afbaa..20fef6c410 100644 --- a/opencl/test/unit_test/perf_tests/api/api_tests.h +++ b/opencl/test/unit_test/perf_tests/api/api_tests.h @@ -39,10 +39,10 @@ struct api_fixture : public PlatformFixture, struct api_tests : public api_fixture, public ::testing::Test { - virtual void SetUp() override { + void SetUp() override { api_fixture::SetUp(); } - virtual void TearDown() override { + void TearDown() override { api_fixture::TearDown(); } }; diff --git a/shared/test/unit_test/test_macros/test.h b/shared/test/unit_test/test_macros/test.h index c2ca30818f..d8abcd6c57 100644 --- a/shared/test/unit_test/test_macros/test.h +++ b/shared/test/unit_test/test_macros/test.h @@ -99,7 +99,7 @@ extern GFXCORE_FAMILY renderCoreFamily; public: \ GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \ () {} \ - virtual void TestBody() override; \ + void TestBody() override; \ \ private: \ static int AddToRegistry() { \ @@ -493,7 +493,7 @@ extern GFXCORE_FAMILY renderCoreFamily; template \ void testBodyHw(); \ \ - virtual void TestBody() override { \ + void TestBody() override { \ FAMILY_SELECTOR(::renderCoreFamily, testBodyHw) \ } \ \