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<HeapIndex, 4> GfxPartition::heap32Names{HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY,
-                                                         HeapIndex::HEAP_INTERNAL,
-                                                         HeapIndex::HEAP_EXTERNAL_DEVICE_MEMORY,
-                                                         HeapIndex::HEAP_EXTERNAL};
+const std::array<HeapIndex, 4> 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, static_cast<uint32_t>(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}};