From 4997dffcf8c9b345f4b4d2da7cdfa9c1f344eba2 Mon Sep 17 00:00:00 2001 From: Jacek Danecki Date: Wed, 13 Mar 2019 13:14:34 +0100 Subject: [PATCH] fix compilation on clang 4 and clang 5 https://github.com/intel/compute-runtime/pull/142 Change-Id: I1a4fecd3dd6dd4739d352f7b811b95403fe68951 Signed-off-by: Jacek Danecki --- runtime/memory_manager/gfx_partition.cpp | 8 ++++---- unit_tests/mocks/mock_gfx_partition.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/runtime/memory_manager/gfx_partition.cpp b/runtime/memory_manager/gfx_partition.cpp index 4cb226dfa9..980a35f1de 100644 --- a/runtime/memory_manager/gfx_partition.cpp +++ b/runtime/memory_manager/gfx_partition.cpp @@ -11,10 +11,10 @@ namespace OCLRT { -const std::array GfxPartition::heap32Names{HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY, - HeapIndex::HEAP_INTERNAL, - HeapIndex::HEAP_EXTERNAL_DEVICE_MEMORY, - HeapIndex::HEAP_EXTERNAL}; +const std::array GfxPartition::heap32Names{{HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY, + HeapIndex::HEAP_INTERNAL, + HeapIndex::HEAP_EXTERNAL_DEVICE_MEMORY, + HeapIndex::HEAP_EXTERNAL}}; void GfxPartition::init(uint64_t gpuAddressSpace) { diff --git a/unit_tests/mocks/mock_gfx_partition.cpp b/unit_tests/mocks/mock_gfx_partition.cpp index cee8e4a347..a4e4483d19 100644 --- a/unit_tests/mocks/mock_gfx_partition.cpp +++ b/unit_tests/mocks/mock_gfx_partition.cpp @@ -10,11 +10,11 @@ using namespace OCLRT; std::array(HeapIndex::TOTAL_HEAPS)> - MockGfxPartition::allHeapNames{HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY, - HeapIndex::HEAP_INTERNAL, - HeapIndex::HEAP_EXTERNAL_DEVICE_MEMORY, - HeapIndex::HEAP_EXTERNAL, - HeapIndex::HEAP_STANDARD, - HeapIndex::HEAP_STANDARD64KB, - HeapIndex::HEAP_SVM, - HeapIndex::HEAP_LIMITED}; + MockGfxPartition::allHeapNames{{HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY, + HeapIndex::HEAP_INTERNAL, + HeapIndex::HEAP_EXTERNAL_DEVICE_MEMORY, + HeapIndex::HEAP_EXTERNAL, + HeapIndex::HEAP_STANDARD, + HeapIndex::HEAP_STANDARD64KB, + HeapIndex::HEAP_SVM, + HeapIndex::HEAP_LIMITED}};