diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-20 09:25:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-20 10:11:51 +0000 |
| commit | e5f2655212d94f7db837913cc2e43cfb487b3973 (patch) | |
| tree | caffe94fd986e082963e4aecc695ad3dcceca8b5 /sal/rtl/alloc_arena.cxx | |
| parent | b3fa8afe903dd4bc3b6dd5f73be1c68a729b378b (diff) | |
tweak high/low bit so we're always shifting with an unsigned number
Change-Id: Ic1c3f1f8aa6a16befb348652b0f5c3f82f47e0e7
Diffstat (limited to 'sal/rtl/alloc_arena.cxx')
| -rw-r--r-- | sal/rtl/alloc_arena.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx index 74254ee15451..19bc4241b3b0 100644 --- a/sal/rtl/alloc_arena.cxx +++ b/sal/rtl/alloc_arena.cxx @@ -428,8 +428,8 @@ rtl_arena_segment_alloc ( assert(*ppSegment == nullptr); if (!RTL_MEMORY_ISP2(size)) { - int msb = highbit(size); - if (RTL_ARENA_FREELIST_SIZE == sal::static_int_cast< size_t >(msb)) + unsigned int msb = highbit(size); + if (RTL_ARENA_FREELIST_SIZE == msb) { /* highest possible freelist: fall back to first fit */ rtl_arena_segment_type *head, *segment; @@ -660,9 +660,7 @@ rtl_arena_destructor (void * obj) assert(arena->m_hash_table == arena->m_hash_table_0); assert(arena->m_hash_size == RTL_ARENA_HASH_SIZE); - assert( - arena->m_hash_shift == - sal::static_int_cast< unsigned >(highbit(arena->m_hash_size) - 1)); + assert(arena->m_hash_shift == highbit(arena->m_hash_size) - 1); } /* ================================================================= */ |