diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h index aa3ec2484e..dcd1fa8985 100644 --- a/AK/StdLibExtras.h +++ b/AK/StdLibExtras.h @@ -17,13 +17,13 @@ #include template -constexpr auto round_up_to_power_of_two(T value, U power_of_two) requires(IsIntegral&& IsIntegral) +constexpr auto round_up_to_power_of_two(T value, U power_of_two) requires(AK::Detail::IsIntegral&& AK::Detail::IsIntegral) { return ((value - 1) & ~(power_of_two - 1)) + power_of_two; } template -constexpr bool is_power_of_two(T value) requires(IsIntegral) +constexpr bool is_power_of_two(T value) requires(AK::Detail::IsIntegral) { return value && !((value) & (value - 1)); } diff --git a/AK/Types.h b/AK/Types.h index 6646fd4254..0bf39d30bf 100644 --- a/AK/Types.h +++ b/AK/Types.h @@ -72,7 +72,7 @@ using mode_t = unsigned short; # endif #endif -using FlatPtr = Conditional; +using FlatPtr = AK::Detail::Conditional; constexpr u64 KiB = 1024; constexpr u64 MiB = KiB * KiB; diff --git a/AK/kmalloc.h b/AK/kmalloc.h index a6188bff32..533ffd73d8 100644 --- a/AK/kmalloc.h +++ b/AK/kmalloc.h @@ -40,14 +40,14 @@ inline size_t malloc_good_size(size_t size) { return size; } using std::nothrow; -inline void* kmalloc_array(Checked a, Checked b) +inline void* kmalloc_array(AK::Checked a, AK::Checked b) { auto size = a * b; VERIFY(!size.has_overflow()); return kmalloc(size.value()); } -inline void* kmalloc_array(Checked a, Checked b, Checked c) +inline void* kmalloc_array(AK::Checked a, AK::Checked b, AK::Checked c) { auto size = a * b * c; VERIFY(!size.has_overflow());