diff options
| author | Fabian Imhof <fabian.imhof@ost.ch> | 2025-02-27 09:21:43 +0100 |
|---|---|---|
| committer | Fabian Imhof <fabian.imhof@ost.ch> | 2025-02-27 09:21:43 +0100 |
| commit | 3fb836101a2032e93f7b82c924ce208d7377a5ea (patch) | |
| tree | 52f9aa1f5316b9938e74f43637c0641803fda01a /arch/x86_64/src/memory/main.cpp | |
| parent | cd42c21f2460751428b3e1b4ae07ea0b924967bc (diff) | |
| parent | 2f1f0fa8b0dc1893219be68ab8bf653b5d6349fb (diff) | |
| download | teachos-3fb836101a2032e93f7b82c924ce208d7377a5ea.tar.xz teachos-3fb836101a2032e93f7b82c924ce208d7377a5ea.zip | |
Merge branch 'feat_new_delete_override' into 'develop_ba'
new delete override
See merge request teachos/kernel!4
Diffstat (limited to 'arch/x86_64/src/memory/main.cpp')
| -rw-r--r-- | arch/x86_64/src/memory/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/src/memory/main.cpp b/arch/x86_64/src/memory/main.cpp index b978319..a6f91d9 100644 --- a/arch/x86_64/src/memory/main.cpp +++ b/arch/x86_64/src/memory/main.cpp @@ -4,7 +4,7 @@ #include "arch/memory/allocator/area_frame_allocator.hpp" #include "arch/memory/cpu/control_register.hpp" #include "arch/memory/cpu/msr.hpp" -#include "arch/memory/heap/concept.hpp" +#include "arch/memory/heap/heap_allocator.hpp" #include "arch/memory/paging/active_page_table.hpp" #include "arch/memory/paging/kernel_mapper.hpp" |