Fix merge issues in memory unit tests (#123)

catch/unit/memory/hipMemPrefetchAsync.cc

@@ -116,11 +116,11 @@ TEST_CASE("Unit_hipMemPrefetchAsync_Rounding_Behavior") {
   HIP_CHECK(hipMemRangeGetAttribute(&attribute, sizeof(attribute),
                                     hipMemRangeAttributeLastPrefetchLocation,
                                     reinterpret_cast<void*>(base), rounded_up));
-  REQUIRE(device == attribute);
+  REQUIRE(device == static_cast<int>(attribute));
   HIP_CHECK(hipMemRangeGetAttribute(&attribute, sizeof(attribute),
                                     hipMemRangeAttributeLastPrefetchLocation, alloc.ptr(),
                                     3 * kPageSize));
-  REQUIRE((rounded_up == 3 * kPageSize ? device : hipInvalidDeviceId) == attribute);
+  REQUIRE((rounded_up == 3 * kPageSize ? device : hipInvalidDeviceId) == static_cast<int>(attribute));
 }
 
 TEST_CASE("Unit_hipMemPrefetchAsync_Negative_Parameters") {