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/examples/allocator_system/allocator_system.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dev/examples/allocator_system') diff --git a/dev/examples/allocator_system/allocator_system.cc b/dev/examples/allocator_system/allocator_system.cc index 169cd97..b500e30 100644 --- a/dev/examples/allocator_system/allocator_system.cc +++ b/dev/examples/allocator_system/allocator_system.cc @@ -32,7 +32,7 @@ public: int main() { - scl::standard_allocator_type allocator; + ocl::standard_allocator_type allocator; // Test 1: claim() + unclaim() std::cout << "=== Test 1: claim/unclaim ===\n"; -- cgit v1.2.3