Merge pull request #3 from Sunday111/countr_zero

Replace custom bitscan with std::countr_zero
Sunday111 · Oct 28, 2024 · 6bb0065 · 6bb0065
2 parents 90f45c3 + 8b453e1
commit 6bb0065
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 83 deletions.
diff --git a/include/ass/bit/bit_scan_constexpr.hpp b/include/ass/bit/bit_scan_constexpr.hpp
diff --git a/include/ass/fixed_bitset.hpp b/include/ass/fixed_bitset.hpp
@@ -4,9 +4,9 @@
 #include <bit>
 #include <cassert>
 #include <cstddef>
+#include <limits>
 
 #include "bit/bit_count_to_type.hpp"
-#include "bit/bit_scan_constexpr.hpp"
 
 namespace ass::fixed_bitset_detail
 {
@@ -110,7 +110,7 @@ class FixedBitset
         for (size_t part_index = 0; part_index != parts_.size(); ++part_index)
         {
             const Part& part = parts_[part_index];
-            const size_t local = BitScanConstexpr(part);
+            const size_t local = std::countr_zero(part);
             result += local;
             if (local != kPartBitsCount)
             {
@@ -134,7 +134,7 @@ class FixedBitset
             mask = ~mask;
             mask <<= ignored_bits;
             const Part part = parts_[part_index] & mask;
-            const size_t local = BitScanConstexpr(part);
+            const size_t local = std::countr_zero(part);
             if (local != kPartBitsCount)
             {
                 return result + local;
@@ -147,7 +147,7 @@ class FixedBitset
         for (; part_index != parts_.size(); ++part_index)
         {
             const Part& part = parts_[part_index];
-            const size_t local = BitScanConstexpr(part);
+            const size_t local = std::countr_zero(part);
             result += local;
             if (local != kPartBitsCount)
             {

diff --git a/tests/bit/bit_scan_test.cpp b/tests/bit/bit_scan_test.cpp