change ARRAY_COUNT macro to constexpr

Change-Id: I027c4e70e3b901f3ffb3c0971935ae67e971db07
This commit is contained in:
Kamil Diedrich
2018-08-13 09:27:49 +02:00
committed by sys_ocldev
parent d51c7ccdd4
commit d3d8b6f905
11 changed files with 27 additions and 31 deletions

View File

@ -32,7 +32,7 @@ using namespace OCLRT;
TEST(ContextMultiDevice, singleDevice) {
cl_device_id devices[] = {
MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr)};
auto numDevices = ARRAY_COUNT(devices);
auto numDevices = static_cast<cl_uint>(arrayCount(devices));
auto retVal = CL_SUCCESS;
auto pContext = Context::create<Context>(nullptr, DeviceVector(devices, numDevices),
@ -68,7 +68,7 @@ TEST(ContextMultiDevice, eightDevices) {
MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr),
MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr),
MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr)};
auto numDevices = ARRAY_COUNT(devices);
auto numDevices = static_cast<cl_uint>(arrayCount(devices));
ASSERT_EQ(8u, numDevices);
auto retVal = CL_SUCCESS;