Use C++20 bit manipulation.

shin1m · Jul 8, 2023 · c543f71 · c543f71
1 parent c8b2578
commit c543f71
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/include/xemmai/heap.h b/include/xemmai/heap.h
@@ -3,6 +3,7 @@
 
 #include "portable/define.h"
 #include <atomic>
+#include <bit>
 #include <map>
 #include <mutex>
 #include <new>
@@ -16,10 +17,6 @@ namespace xemmai
 template<typename T>
 class t_heap
 {
-	static constexpr size_t f_log(size_t a_x)
-	{
-		return a_x > 1 ? f_log(a_x >> 1) + 1 : 0;
-	}
 	static void* f_map(size_t a_n)
 	{
 #ifdef __unix__
@@ -139,10 +136,10 @@ class t_heap
 	constexpr T* f_allocate_medium(size_t a_size);
 
 public:
-	static constexpr size_t V_UNIT = 2 << f_log(sizeof(T) - 1);
+	static constexpr size_t V_UNIT = std::bit_ceil(sizeof(T));
 	static_assert(V_UNIT >> 1 < sizeof(T));
 	static_assert(V_UNIT >= sizeof(T));
-	static constexpr size_t V_RANKX = sizeof(void*) * 8 - f_log(V_UNIT);
+	static constexpr size_t V_RANKX = std::countl_zero(V_UNIT - 1);
 	static_assert((V_UNIT << (V_RANKX - 1)) - 1 == ~size_t(0) >> 1);
 	static_assert((V_UNIT << V_RANKX) - 1 == ~size_t(0));