From 4e62a23e3d9d071e0ed7c7a75421c41314c3b90a Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 12 Oct 2023 15:14:04 +0200 Subject: memory: fix namespace of asm_pointer --- source/arch/x86_64/src/video/vga/text.cpp | 2 +- source/include/memory/asm_pointer.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/arch/x86_64/src/video/vga/text.cpp b/source/arch/x86_64/src/video/vga/text.cpp index 8259c5a..f1e7412 100644 --- a/source/arch/x86_64/src/video/vga/text.cpp +++ b/source/arch/x86_64/src/video/vga/text.cpp @@ -16,7 +16,7 @@ namespace teachos::arch::video::vga::text auto constexpr default_text_buffer_address = 0xb8000; extern "C" std::pair * vga_buffer_pointer; - auto constinit text_buffer = teachos::boot::asm_pointer{vga_buffer_pointer}; + auto constinit text_buffer = teachos::memory::asm_pointer{vga_buffer_pointer}; auto write(char code_point, attribute attribute) -> void { diff --git a/source/include/memory/asm_pointer.hpp b/source/include/memory/asm_pointer.hpp index b2e890c..2001561 100644 --- a/source/include/memory/asm_pointer.hpp +++ b/source/include/memory/asm_pointer.hpp @@ -1,7 +1,7 @@ -#ifndef TEACHOS_BOOT_ASM_POINTER_HPP -#define TEACHOS_BOOT_ASM_POINTER_HPP +#ifndef TEACHOS_MEMORY_ASM_POINTER_HPP +#define TEACHOS_MEMORY_ASM_POINTER_HPP -namespace teachos::boot +namespace teachos::memory { template @@ -40,6 +40,6 @@ namespace teachos::boot Type const * m_pointer; }; -} // namespace teachos::boot +} // namespace teachos::memory #endif \ No newline at end of file -- cgit v1.2.3