mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits

Browse Source 
1UL is not a portable way to get a size_t -sized one.

Change-Id: I8fac16b7e1f1b8bbccb4bd11eacc9449fc3f8c33
This commit is contained in:
Tor Lillqvist
2013-08-30 12:04:15 +03:00
parent fb30ed471e
commit 16a4b7ad73
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sal/rtl/alloc_arena.cxx
View File

@@ -452,7 +452,7 @@ rtl_arena_segment_alloc (
} }
/* roundup to next power of 2 */ /* roundup to next power of 2 */
size = (1UL << msb); size = (((sal_Size)1) << msb);
} }
index = lowbit(RTL_MEMORY_P2ALIGN(arena->m_freelist_bitmap, size)); index = lowbit(RTL_MEMORY_P2ALIGN(arena->m_freelist_bitmap, size));
@@ -619,7 +619,7 @@ rtl_arena_constructor (void * obj)
head = &(arena->m_freelist_head[i]); head = &(arena->m_freelist_head[i]);
rtl_arena_segment_constructor (head); rtl_arena_segment_constructor (head);
head->m_size = (1UL << i); head->m_size = (((sal_Size)1) << i);
head->m_type = RTL_ARENA_SEGMENT_TYPE_HEAD; head->m_type = RTL_ARENA_SEGMENT_TYPE_HEAD;
} }
@@ -658,7 +658,7 @@ rtl_arena_destructor (void * obj)
{ {
head = &(arena->m_freelist_head[i]); head = &(arena->m_freelist_head[i]);
assert(head->m_size == (1UL << i)); assert(head->m_size == (((sal_Size)1) << i));
assert(head->m_type == RTL_ARENA_SEGMENT_TYPE_HEAD); assert(head->m_type == RTL_ARENA_SEGMENT_TYPE_HEAD);
rtl_arena_segment_destructor (head); rtl_arena_segment_destructor (head);
@@ -694,7 +694,7 @@ rtl_arena_activate (
if (!RTL_MEMORY_ISP2(quantum)) if (!RTL_MEMORY_ISP2(quantum))
{ {
/* roundup to next power of 2 */ /* roundup to next power of 2 */
quantum = (1UL << highbit(quantum)); quantum = (((sal_Size)1) << highbit(quantum));
} }
quantum_cache_max = RTL_MEMORY_P2ROUNDUP(quantum_cache_max, quantum); quantum_cache_max = RTL_MEMORY_P2ROUNDUP(quantum_cache_max, quantum);

6
sal/rtl/alloc_cache.cxx
View File

@@ -859,9 +859,9 @@ rtl_cache_activate (
if (flags & RTL_CACHE_FLAG_QUANTUMCACHE) if (flags & RTL_CACHE_FLAG_QUANTUMCACHE)
{ {
/* next power of 2 above 3 * qcache_max */ /* next power of 2 above 3 * qcache_max */
if(slabsize < (1UL << highbit(3 * source->m_qcache_max))) if(slabsize < (((sal_Size)1) << highbit(3 * source->m_qcache_max)))
{ {
slabsize = (1UL << highbit(3 * source->m_qcache_max)); slabsize = (((sal_Size)1) << highbit(3 * source->m_qcache_max));
} }
} }
else else
@@ -875,7 +875,7 @@ rtl_cache_activate (
slabsize = RTL_MEMORY_P2ROUNDUP(slabsize, source->m_quantum); slabsize = RTL_MEMORY_P2ROUNDUP(slabsize, source->m_quantum);
if (!RTL_MEMORY_ISP2(slabsize)) if (!RTL_MEMORY_ISP2(slabsize))
slabsize = 1UL << highbit(slabsize); slabsize = (((sal_Size)1) << highbit(slabsize));
cache->m_slab_size = slabsize; cache->m_slab_size = slabsize;
if (cache->m_slab_size > source->m_quantum) if (cache->m_slab_size > source->m_quantum)