From 3827ae4e821ff3758d1eaf2dbacc55a22f802731 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 17 Nov 2025 10:31:30 +0100 Subject: feat: fixing merge conflicts. Signed-off-by: Amlal El Mahrouss --- dev/tests/tracked_ptr_basic/tracked_ptr_test.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dev/tests/tracked_ptr_basic') diff --git a/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc b/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc index decae88..1e97188 100644 --- a/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc +++ b/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc @@ -10,16 +10,16 @@ TEST(TrackedPtrTest, BasicTrackedPtrUsage) { - scl::memory::tracked_ptr ptr = scl::memory::make_tracked(42); + ocl::memory::tracked_ptr ptr = ocl::memory::make_tracked(42); ASSERT_TRUE(ptr); EXPECT_EQ(*ptr, 42); - scl::memory::tracked_ptr ptr2; + ocl::memory::tracked_ptr ptr2; - scl::memory::swap(ptr, ptr2); + ocl::memory::swap(ptr, ptr2); ptr2.reset(); - EXPECT_EQ(scl::memory::tracked_ptr::manager().allocator().allocated_count_, 1); + EXPECT_EQ(ocl::memory::tracked_ptr::manager().allocator().allocated_count_, 1); } \ No newline at end of file -- cgit v1.2.3