From 429d99ca40254e9e19da938ff9f2065a543708cd Mon Sep 17 00:00:00 2001 From: Fabian Imhof Date: Tue, 15 Oct 2024 09:05:37 +0000 Subject: rename contains_flags parameter --- arch/x86_64/include/arch/memory/multiboot.hpp | 4 ++-- arch/x86_64/include/arch/memory/paging.hpp | 4 ++-- arch/x86_64/src/memory/multiboot.cpp | 2 +- arch/x86_64/src/memory/paging.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86_64/include/arch/memory/multiboot.hpp b/arch/x86_64/include/arch/memory/multiboot.hpp index c070e85..9a753fa 100644 --- a/arch/x86_64/include/arch/memory/multiboot.hpp +++ b/arch/x86_64/include/arch/memory/multiboot.hpp @@ -180,10 +180,10 @@ namespace teachos::arch::memory * bits that are set in the given std::bitset also have to be set in the underlyng std::bitset. Any additional bits * that are set are not relevant. * - * @param flags Flags that we want to compare against and check if the underlying std::bitset has the same bits set. + * @param other Flags that we want to compare against and check if the underlying std::bitset has the same bits set. * @return Whether the given flags are a subset or equivalent with the underlying std::bitset */ - auto contains_flags(std::bitset<64U> b) const -> bool; + auto contains_flags(std::bitset<64U> other) const -> bool; /** * @brief Allows to compare the underlying std::bitset of two instances diff --git a/arch/x86_64/include/arch/memory/paging.hpp b/arch/x86_64/include/arch/memory/paging.hpp index 0b928b0..16fa476 100644 --- a/arch/x86_64/include/arch/memory/paging.hpp +++ b/arch/x86_64/include/arch/memory/paging.hpp @@ -86,10 +86,10 @@ namespace teachos::arch::memory * bits that are set in the given std::bitset also have to be set in the underlyng std::bitset. Any additional bits * that are set are not relevant. * - * @param flags Flags that we want to compare against and check if the underlying std::bitset has the same bits set. + * @param other Flags that we want to compare against and check if the underlying std::bitset has the same bits set. * @return Whether the given flags are a subset or equivalent with the underlying std::bitset */ - auto contains_flags(std::bitset<64U> b) const -> bool; + auto contains_flags(std::bitset<64U> other) const -> bool; private: /** diff --git a/arch/x86_64/src/memory/multiboot.cpp b/arch/x86_64/src/memory/multiboot.cpp index b0432a9..8c6793e 100644 --- a/arch/x86_64/src/memory/multiboot.cpp +++ b/arch/x86_64/src/memory/multiboot.cpp @@ -2,7 +2,7 @@ namespace teachos::arch::memory { - auto elf_section_flags::contains_flags(std::bitset<64U> b) const -> bool { return (flags & b) == b; } + auto elf_section_flags::contains_flags(std::bitset<64U> other) const -> bool { return (flags & other) == other; } auto elf_section_header::is_null() const -> bool { diff --git a/arch/x86_64/src/memory/paging.cpp b/arch/x86_64/src/memory/paging.cpp index 4603e74..445c796 100644 --- a/arch/x86_64/src/memory/paging.cpp +++ b/arch/x86_64/src/memory/paging.cpp @@ -31,7 +31,7 @@ namespace teachos::arch::memory return value; } - auto entry::contains_flags(std::bitset<64U> b) const -> bool { return (flags & b) == b; } + auto entry::contains_flags(std::bitset<64U> other) const -> bool { return (flags & other) == other; } auto entry::set_address(physical_frame frame) -> void { -- cgit v1.2.3