From 3b577bb13ad58a8e4e6880bb3ee52600247eb2e7 Mon Sep 17 00:00:00 2001 From: James Price Date: Fri, 9 Nov 2018 11:04:50 +0000 Subject: [PATCH] Make template type explicit for std::min calls Fixes build on macOS, which complained about the mismatched argument types. --- .../clcpp/synchronization/test_sub_group_barrier.hpp | 2 +- .../clcpp/synchronization/test_work_group_barrier.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test_conformance/clcpp/synchronization/test_sub_group_barrier.hpp b/test_conformance/clcpp/synchronization/test_sub_group_barrier.hpp index 20de1824..c7074ed0 100644 --- a/test_conformance/clcpp/synchronization/test_sub_group_barrier.hpp +++ b/test_conformance/clcpp/synchronization/test_sub_group_barrier.hpp @@ -249,7 +249,7 @@ int test(cl_device_id device, cl_context context, cl_command_queue queue, test_o error = clGetDeviceInfo(device, CL_DEVICE_LOCAL_MEM_SIZE, sizeof(device_local_mem_size), &device_local_mem_size, NULL); RETURN_ON_CL_ERROR(error, "clGetDeviceInfo") - max_work_group_size = (std::min)(max_work_group_size, (device_local_mem_size - kernel_local_mem_size) / sizeof(cl_long)); + max_work_group_size = (std::min)(max_work_group_size, (device_local_mem_size - kernel_local_mem_size) / sizeof(cl_long)); } std::random_device rd; diff --git a/test_conformance/clcpp/synchronization/test_work_group_barrier.hpp b/test_conformance/clcpp/synchronization/test_work_group_barrier.hpp index 79451fb8..aa7fbd20 100644 --- a/test_conformance/clcpp/synchronization/test_work_group_barrier.hpp +++ b/test_conformance/clcpp/synchronization/test_work_group_barrier.hpp @@ -237,7 +237,7 @@ int test(cl_device_id device, cl_context context, cl_command_queue queue, test_o error = clGetDeviceInfo(device, CL_DEVICE_LOCAL_MEM_SIZE, sizeof(device_local_mem_size), &device_local_mem_size, NULL); RETURN_ON_CL_ERROR(error, "clGetDeviceInfo") - max_work_group_size = (std::min)(max_work_group_size, (device_local_mem_size - kernel_local_mem_size) / sizeof(cl_long)); + max_work_group_size = (std::min)(max_work_group_size, (device_local_mem_size - kernel_local_mem_size) / sizeof(cl_long)); } std::random_device rd;