diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-17 10:31:30 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-17 10:31:30 +0100 |
| commit | 3827ae4e821ff3758d1eaf2dbacc55a22f802731 (patch) | |
| tree | 0768b1a509bd104627675127f1e9785c702e7621 /dev/lib/memory | |
| parent | 5c5a101c9618f8edea5038e94df64508b0f0a70e (diff) | |
feat: fixing merge conflicts.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/lib/memory')
| -rw-r--r-- | dev/lib/memory/tracked_ptr.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/lib/memory/tracked_ptr.hpp b/dev/lib/memory/tracked_ptr.hpp index eb33bd0..d2f8450 100644 --- a/dev/lib/memory/tracked_ptr.hpp +++ b/dev/lib/memory/tracked_ptr.hpp @@ -16,7 +16,7 @@ #include <unistd.h> #include <signal.h> -namespace scl::memory +namespace ocl::memory { template <typename T> class tracked_allocator; @@ -232,4 +232,4 @@ namespace scl::memory ::kill(::getpid(), SIGTRAP); } } -} // namespace scl::memory +} // namespace ocl::memory |