Remove redundant virtual keywords

Change-Id: Ib303290dd5e4ce723eeb3670d6a3ceb8019cabd3
Signed-off-by: Jablonski, Mateusz <mateusz.jablonski@intel.com>
This commit is contained in:
Jablonski, Mateusz
2020-03-12 09:45:33 +01:00
committed by sys_ocldev
parent ff09ef9263
commit d3f3c4a9de
14 changed files with 32 additions and 32 deletions

View File

@@ -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();
}
};

View File

@@ -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;

View File

@@ -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<BufferRect>::create();
}
virtual void TearDown(void) override {
void TearDown(void) override {
delete srcBuffer;
delete dstBuffer;
delete BufferDefaults::context;

View File

@@ -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;

View File

@@ -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();
}

View File

@@ -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;

View File

@@ -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();

View File

@@ -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;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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;
}

View File

@@ -28,11 +28,11 @@ BOOL WINAPI QueryPerformanceCounterMock(
struct OSTimeWinTest : public ::testing::Test {
public:
virtual void SetUp() override {
void SetUp() override {
osTime = std::unique_ptr<MockOSTimeWin>(new MockOSTimeWin(nullptr));
}
virtual void TearDown() override {
void TearDown() override {
}
std::unique_ptr<MockOSTimeWin> osTime;
};

View File

@@ -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();
}
};