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/core | |
| parent | 5c5a101c9618f8edea5038e94df64508b0f0a70e (diff) | |
feat: fixing merge conflicts.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/lib/core')
| -rw-r--r-- | dev/lib/core/allocator_system.hpp | 10 | ||||
| -rw-r--r-- | dev/lib/core/error_handler.hpp | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/dev/lib/core/allocator_system.hpp b/dev/lib/core/allocator_system.hpp index 3ffa02a..6fd0119 100644 --- a/dev/lib/core/allocator_system.hpp +++ b/dev/lib/core/allocator_system.hpp @@ -5,13 +5,13 @@ * Copyright 2025, Amlal El Mahrouss. Licensed under the BSL 1.0 license */ -#ifndef _SCL_ALLOCATOR_SYSTEM_HPP -#define _SCL_ALLOCATOR_SYSTEM_HPP +#ifndef _OCL_ALLOCATOR_SYSTEM_HPP +#define _OCL_ALLOCATOR_SYSTEM_HPP #include <lib/core/includes.hpp> #include <memory> -namespace scl +namespace ocl { template <typename type> struct new_op final @@ -69,6 +69,6 @@ namespace scl template <typename type> using standard_allocator_type = allocator_system<type, new_op<type>, delete_op<type>>; -} // namespace scl +} // namespace ocl -#endif // ifndef _SCL_ALLOCATOR_SYSTEM_HPP +#endif // ifndef _OCL_ALLOCATOR_SYSTEM_HPP diff --git a/dev/lib/core/error_handler.hpp b/dev/lib/core/error_handler.hpp index 449e255..67bf7b4 100644 --- a/dev/lib/core/error_handler.hpp +++ b/dev/lib/core/error_handler.hpp @@ -5,13 +5,13 @@ * Copyright 2025, Amlal El Mahrouss. */ -#ifndef _SCL_ERROR_HANDLER_HPP -#define _SCL_ERROR_HANDLER_HPP +#ifndef _OCL_ERROR_HANDLER_HPP +#define _OCL_ERROR_HANDLER_HPP #include <lib/core/includes.hpp> #include <lib/io/print.hpp> -namespace scl +namespace ocl { struct basic_error_handler; @@ -25,12 +25,12 @@ namespace scl virtual void operator()(const std::basic_string<char>& msg) { - scl::io::print(msg); + ocl::io::print(msg); } }; using standard_error_handler = basic_error_handler; using error_handler_type = basic_error_handler; -} // namespace scl +} // namespace ocl -#endif // ifndef _SCL_ERROR_HANDLER_HPP +#endif // ifndef _OCL_ERROR_HANDLER_HPP |