diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 00:37:15 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 00:37:15 +0000 |
| commit | b059c3c4c38178aa96801a0cc75763974c55ad37 (patch) | |
| tree | f5c11d8a274758855772d06bc6339a3ca846c765 /third_party/jemalloc | |
| parent | c33869b62c2ad4463b209d46bfb75cd1d9d986ad (diff) | |
| download | chromium_src-b059c3c4c38178aa96801a0cc75763974c55ad37.zip chromium_src-b059c3c4c38178aa96801a0cc75763974c55ad37.tar.gz chromium_src-b059c3c4c38178aa96801a0cc75763974c55ad37.tar.bz2 | |
Fix jemalloc c4334 warnings when compiling win64
BUG=166496
TBR=cpu
Review URL: https://codereview.chromium.org/12230011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/jemalloc')
| -rw-r--r-- | third_party/jemalloc/chromium/jemalloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/jemalloc/chromium/jemalloc.c b/third_party/jemalloc/chromium/jemalloc.c index f1c92c2..221d432 100644 --- a/third_party/jemalloc/chromium/jemalloc.c +++ b/third_party/jemalloc/chromium/jemalloc.c @@ -4824,7 +4824,7 @@ arena_new(arena_t *arena) bin->runcur = NULL; arena_run_tree_new(&bin->runs); - bin->reg_size = (1U << (TINY_MIN_2POW + i)); + bin->reg_size = ((size_t)1 << (TINY_MIN_2POW + i)); prev_run_size = arena_bin_run_size_calc(bin, prev_run_size); @@ -5875,7 +5875,7 @@ MALLOC_OUT: /* Set variables according to the value of opt_small_max_2pow. */ if (opt_small_max_2pow < opt_quantum_2pow) opt_small_max_2pow = opt_quantum_2pow; - small_max = (1U << opt_small_max_2pow); + small_max = ((size_t)1 << opt_small_max_2pow); /* Set bin-related variables. */ bin_maxclass = (pagesize >> 1); @@ -5886,7 +5886,7 @@ MALLOC_OUT: nsbins = pagesize_2pow - opt_small_max_2pow - 1; /* Set variables according to the value of opt_quantum_2pow. */ - quantum = (1U << opt_quantum_2pow); + quantum = ((size_t)1 << opt_quantum_2pow); quantum_mask = quantum - 1; if (ntbins > 0) small_min = (quantum >> 1) + 1; @@ -5895,7 +5895,7 @@ MALLOC_OUT: assert(small_min <= quantum); /* Set variables according to the value of opt_chunk_2pow. */ - chunksize = (1LU << opt_chunk_2pow); + chunksize = ((size_t)1 << opt_chunk_2pow); chunksize_mask = chunksize - 1; chunk_npages = (chunksize >> pagesize_2pow); { |