From 2869d836578fe4be2a0ca65574201489e17e662a Mon Sep 17 00:00:00 2001 From: "Jablonski, Mateusz" Date: Mon, 16 Mar 2020 19:40:04 +0100 Subject: [PATCH] Remove default parameters from virtual methods Change-Id: If842bbd0079f073b07324522ff2951e9dac6bf22 Signed-off-by: Jablonski, Mateusz --- opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h | 5 ++++- opencl/test/unit_test/mocks/mock_aub_manager.h | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h index 1f80cfd6de..07027d4e20 100644 --- a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h @@ -30,7 +30,10 @@ class Program; struct HelloWorldKernelFixture : public ProgramFixture { using ProgramFixture::SetUp; - virtual void SetUp(ClDevice *pDevice, const char *kernelFilenameStr, const char *kernelNameStr, const char *options = nullptr) { + void SetUp(ClDevice *pDevice, const char *kernelFilenameStr, const char *kernelNameStr) { + SetUp(pDevice, kernelFilenameStr, kernelNameStr, nullptr); + } + void SetUp(ClDevice *pDevice, const char *kernelFilenameStr, const char *kernelNameStr, const char *options) { ProgramFixture::SetUp(); pTestFilename = new std::string(kernelFilenameStr); diff --git a/opencl/test/unit_test/mocks/mock_aub_manager.h b/opencl/test/unit_test/mocks/mock_aub_manager.h index f088931f20..2cfd9cfd21 100644 --- a/opencl/test/unit_test/mocks/mock_aub_manager.h +++ b/opencl/test/unit_test/mocks/mock_aub_manager.h @@ -19,9 +19,9 @@ struct MockHardwareContext : public aub_stream::HardwareContext { void initialize() override { initializeCalled = true; } void pollForCompletion() override { pollForCompletionCalled = true; } - void writeAndSubmitBatchBuffer(uint64_t gfxAddress, const void *batchBuffer, size_t size, uint32_t memoryBank, size_t pageSize = 65536) override { writeAndSubmitCalled = true; } + void writeAndSubmitBatchBuffer(uint64_t gfxAddress, const void *batchBuffer, size_t size, uint32_t memoryBank, size_t pageSize) override { writeAndSubmitCalled = true; } void submitBatchBuffer(uint64_t gfxAddress, bool overrideRingHead) override { submitCalled = true; } - void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize = 65536) override { + void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize) override { writeMemoryCalled = true; writeMemoryPageSizePassed = pageSize; memoryBanksPassed = memoryBanks; @@ -96,7 +96,7 @@ class MockAubManager : public aub_stream::AubManager { addCommentCalled = true; } - void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize = 65536) override { + void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize) override { writeMemoryCalled = true; hintToWriteMemory = hint; writeMemoryPageSizePassed = pageSize;