From fb949f9256005c02b68fc3df9eb84e2c6410dcf5 Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Tue, 13 Dec 2022 17:53:11 +0000 Subject: [PATCH] events: Remove unused BufferAction::Setup parameter (#1586) `BufferAction::Setup` has an additional parameter `allocate` which hides the virtual function `Action::Setup`. The additional parameter was unused anyway, so remove it. Fixes a -Woverloaded-virtual warning. Signed-off-by: Sven van Haastregt Signed-off-by: Sven van Haastregt --- test_conformance/events/action_classes.cpp | 10 +++++----- test_conformance/events/action_classes.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test_conformance/events/action_classes.cpp b/test_conformance/events/action_classes.cpp index a84be6b6..55dbc477 100644 --- a/test_conformance/events/action_classes.cpp +++ b/test_conformance/events/action_classes.cpp @@ -189,7 +189,7 @@ cl_int NDRangeKernelAction::Execute(cl_command_queue queue, cl_uint numWaits, #pragma mark -------------------- Buffer Sub-Classes ------------------------- cl_int BufferAction::Setup(cl_device_id device, cl_context context, - cl_command_queue queue, bool allocate) + cl_command_queue queue) { cl_int error; cl_ulong maxAllocSize; @@ -227,7 +227,7 @@ cl_int BufferAction::Setup(cl_device_id device, cl_context context, cl_int ReadBufferAction::Setup(cl_device_id device, cl_context context, cl_command_queue queue) { - return BufferAction::Setup(device, context, queue, true); + return BufferAction::Setup(device, context, queue); } cl_int ReadBufferAction::Execute(cl_command_queue queue, cl_uint numWaits, @@ -243,7 +243,7 @@ cl_int ReadBufferAction::Execute(cl_command_queue queue, cl_uint numWaits, cl_int WriteBufferAction::Setup(cl_device_id device, cl_context context, cl_command_queue queue) { - return BufferAction::Setup(device, context, queue, true); + return BufferAction::Setup(device, context, queue); } cl_int WriteBufferAction::Execute(cl_command_queue queue, cl_uint numWaits, @@ -265,7 +265,7 @@ MapBufferAction::~MapBufferAction() cl_int MapBufferAction::Setup(cl_device_id device, cl_context context, cl_command_queue queue) { - return BufferAction::Setup(device, context, queue, false); + return BufferAction::Setup(device, context, queue); } cl_int MapBufferAction::Execute(cl_command_queue queue, cl_uint numWaits, @@ -283,7 +283,7 @@ cl_int MapBufferAction::Execute(cl_command_queue queue, cl_uint numWaits, cl_int UnmapBufferAction::Setup(cl_device_id device, cl_context context, cl_command_queue queue) { - cl_int error = BufferAction::Setup(device, context, queue, false); + cl_int error = BufferAction::Setup(device, context, queue); if (error != CL_SUCCESS) return error; mMappedPtr = clEnqueueMapBuffer(queue, mBuffer, CL_TRUE, CL_MAP_READ, 0, diff --git a/test_conformance/events/action_classes.h b/test_conformance/events/action_classes.h index e528f11a..3f315429 100644 --- a/test_conformance/events/action_classes.h +++ b/test_conformance/events/action_classes.h @@ -72,7 +72,7 @@ public: virtual ~BufferAction() { free(mOutBuffer); } virtual cl_int Setup(cl_device_id device, cl_context context, - cl_command_queue queue, bool allocate); + cl_command_queue queue); }; class ReadBufferAction : public BufferAction {