project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid compiler warnings on Windows.

Browse Source
This commit is contained in:
Jason Evans 2017-05-11 16:50:49 -07:00
parent 11d2f39d96
commit 81ef365622
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/jemalloc/internal/bitmap.h
View File

@ -249,8 +249,8 @@ bitmap_ffu(const bitmap_t *bitmap, const bitmap_info_t *binfo, size_t min_bit) {
1)); 1));
bitmap_t group = bitmap[binfo->levels[level].group_offset + (bit bitmap_t group = bitmap[binfo->levels[level].group_offset + (bit
>> lg_bits_per_group)]; >> lg_bits_per_group)];
unsigned group_nmask = ((min_bit > bit) ? (min_bit - bit) : 0) unsigned group_nmask = (unsigned)(((min_bit > bit) ? (min_bit -
>> (lg_bits_per_group - LG_BITMAP_GROUP_NBITS); bit) : 0) >> (lg_bits_per_group - LG_BITMAP_GROUP_NBITS));
assert(group_nmask <= BITMAP_GROUP_NBITS); assert(group_nmask <= BITMAP_GROUP_NBITS);
bitmap_t group_mask = ~((1LU << group_nmask) - 1); bitmap_t group_mask = ~((1LU << group_nmask) - 1);
bitmap_t group_masked = group & group_mask; bitmap_t group_masked = group & group_mask;
@ -265,7 +265,7 @@ bitmap_ffu(const bitmap_t *bitmap, const bitmap_info_t *binfo, size_t min_bit) {
* next sibling. This will recurse at most once per * next sibling. This will recurse at most once per
* non-root level. * non-root level.
*/ */
size_t sib_base = bit + (1U << lg_bits_per_group); size_t sib_base = bit + (ZU(1) << lg_bits_per_group);
assert(sib_base > min_bit); assert(sib_base > min_bit);
assert(sib_base > bit); assert(sib_base > bit);
if (sib_base >= binfo->nbits) { if (sib_base >= binfo->nbits) {
@ -273,8 +273,8 @@ bitmap_ffu(const bitmap_t *bitmap, const bitmap_info_t *binfo, size_t min_bit) {
} }
return bitmap_ffu(bitmap, binfo, sib_base); return bitmap_ffu(bitmap, binfo, sib_base);
} }
bit += (ffs_lu(group_masked) - 1) << (lg_bits_per_group - bit += ((size_t)(ffs_lu(group_masked) - 1)) <<
LG_BITMAP_GROUP_NBITS); (lg_bits_per_group - LG_BITMAP_GROUP_NBITS);
} }
assert(bit >= min_bit); assert(bit >= min_bit);
assert(bit < binfo->nbits); assert(bit < binfo->nbits);