SWDEV-447525 - Fix merge conflict.

jaydeeppatel1111 · jaydeeppatel1111 · commit 79162c244b54 · 2024-03-13T11:52:28.000Z
Change-Id: I9dc852e634fb702a0d17ace3fad53e14178d4da0
diff --git a/hipamd/src/hip_mempool_impl.hpp b/hipamd/src/hip_mempool_impl.hpp
@@ -215,7 +215,7 @@ class MemoryPool : public amd::ReferenceCountedObject {
                      .handleTypes = hipMemHandleTypeNone,
                      .location = {.type = hipMemLocationTypeDevice, .id = device_->deviceId()},
                      .win32SecurityAttributes = nullptr,
-                     .maxSize = 0;
+                     .maxSize = 0,
                      .reserved = {}};
     }
     state_.interprocess_ = properties_.handleTypes != hipMemHandleTypeNone;

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ class MemoryPool : public amd::ReferenceCountedObject {`
`215`	`215`	`.handleTypes = hipMemHandleTypeNone,`
`216`	`216`	`.location = {.type = hipMemLocationTypeDevice, .id = device_->deviceId()},`
`217`	`217`	`.win32SecurityAttributes = nullptr,`
`218`		`- .maxSize = 0;`
	`218`	`+ .maxSize = 0,`
`219`	`219`	`.reserved = {}};`
`220`	`220`	`}`
`221`	`221`	`state_.interprocess_ = properties_.handleTypes != hipMemHandleTypeNone;`