diff options
Diffstat (limited to 'asl/containers')
| -rw-r--r-- | asl/containers/buffer.hpp | 3 | ||||
| -rw-r--r-- | asl/containers/hash_set.hpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/asl/containers/buffer.hpp b/asl/containers/buffer.hpp index f684808..d61abf9 100644 --- a/asl/containers/buffer.hpp +++ b/asl/containers/buffer.hpp @@ -9,6 +9,7 @@ #include "asl/memory/memory.hpp" #include "asl/base/annotations.hpp" #include "asl/base/assert.hpp" +#include "asl/base/bit.hpp" #include "asl/types/span.hpp" #include "asl/hashing/hash.hpp" @@ -320,7 +321,7 @@ public: if (new_capacity <= capacity()) { return; } ASL_ASSERT(new_capacity > kInlineCapacity); - new_capacity = static_cast<isize_t>(round_up_pow2(static_cast<uint64_t>(new_capacity))); + new_capacity = static_cast<isize_t>(bit_ceil(static_cast<uint64_t>(new_capacity))); T* old_data = data(); const isize_t old_capacity = capacity(); diff --git a/asl/containers/hash_set.hpp b/asl/containers/hash_set.hpp index 6e6f851..809b402 100644 --- a/asl/containers/hash_set.hpp +++ b/asl/containers/hash_set.hpp @@ -7,6 +7,7 @@ #include "asl/base/annotations.hpp" #include "asl/base/utility.hpp" #include "asl/base/meta.hpp" +#include "asl/base/bit.hpp" #include "asl/memory/allocator.hpp" #include "asl/memory/memory.hpp" #include "asl/types/maybe_uninit.hpp" @@ -83,7 +84,7 @@ protected: ASL_ASSERT(size > 0); return max<isize_t>( kMinCapacity, - static_cast<isize_t>(round_up_pow2((static_cast<uint64_t>(size) * 4 + 2) / 3))); + static_cast<isize_t>(bit_ceil((static_cast<uint64_t>(size) * 4 + 2) / 3))); } static void insert_inner( |