diff options
Diffstat (limited to 'kernel/src/kapi')
| -rw-r--r-- | kernel/src/kapi/cio.cpp | 3 | ||||
| -rw-r--r-- | kernel/src/kapi/memory.cpp | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/kernel/src/kapi/cio.cpp b/kernel/src/kapi/cio.cpp index fd5ad0d..01c6420 100644 --- a/kernel/src/kapi/cio.cpp +++ b/kernel/src/kapi/cio.cpp @@ -17,8 +17,7 @@ namespace teachos::cio constinit null_device null_device::instance; } // namespace - // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) - constinit auto active_device = static_cast<output_device *>(&null_device::instance); + constinit auto static active_device = static_cast<output_device *>(&null_device::instance); auto set_output_device(output_device & device) -> std::optional<output_device *> { diff --git a/kernel/src/kapi/memory.cpp b/kernel/src/kapi/memory.cpp index d6c84e1..2f707ec 100644 --- a/kernel/src/kapi/memory.cpp +++ b/kernel/src/kapi/memory.cpp @@ -50,10 +50,8 @@ namespace teachos::memory constinit bad_page_mapper bad_page_mapper::instance{}; } // namespace - // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) - constinit auto active_frame_allocator = static_cast<frame_allocator *>(&bad_frame_allocator::instance); - // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) - constinit auto active_page_mapper = static_cast<page_mapper *>(&bad_page_mapper::instance); + constinit auto static active_frame_allocator = static_cast<frame_allocator *>(&bad_frame_allocator::instance); + constinit auto static active_page_mapper = static_cast<page_mapper *>(&bad_page_mapper::instance); auto set_frame_allocator(frame_allocator & allocator) -> std::optional<frame_allocator *> { |