diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-10-07 15:27:37 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-10-07 15:27:37 +1100 |
| commit | d6c7a001dded7b000a08d8675592f912ccdbab79 (patch) | |
| tree | 21fb229070aa02ac8ad942254cfc516ece22a9d3 | |
| parent | 6775c3401a4e51aeff02c0f369ba7a8a0b9af633 (diff) | |
| download | mongo-d6c7a001dded7b000a08d8675592f912ccdbab79.tar.gz | |
WT-2937 Fix a warning. (#3084)
../src/evict/evict_lru.c:1081:29: error: implicit conversion loses integer precision: 'unsigned long long' to 'u_int' (aka 'unsigned int') [-Werror,-Wshorten-64-to-32]
WT_MIN(max_entries, 1 + __wt_cache_pages_inuse(cache) / 2);
~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../src/include/misc.h:62:42: note: expanded from macro 'WT_MIN'
^
../src/evict/evict_lru.c:1084:29: error: implicit conversion loses integer precision: 'unsigned long long' to 'u_int' (aka 'unsigned int') [-Werror,-Wshorten-64-to-32]
WT_MIN(max_entries, 1 + cache->pages_dirty_leaf / 2);
~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../src/include/misc.h:62:42: note: expanded from macro 'WT_MIN'
| -rw-r--r-- | src/evict/evict_lru.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c index 624a95332af..45ec9bce3b5 100644 --- a/src/evict/evict_lru.c +++ b/src/evict/evict_lru.c @@ -1077,11 +1077,11 @@ __evict_walk(WT_SESSION_IMPL *session, WT_EVICT_QUEUE *queue) * candidate pages in cache, don't put all of them on one queue. */ if (F_ISSET(cache, WT_CACHE_EVICT_CLEAN)) - max_entries = - WT_MIN(max_entries, 1 + __wt_cache_pages_inuse(cache) / 2); + max_entries = WT_MIN(max_entries, + 1 + (uint32_t)(__wt_cache_pages_inuse(cache) / 2)); else - max_entries = - WT_MIN(max_entries, 1 + cache->pages_dirty_leaf / 2); + max_entries = WT_MIN(max_entries, + 1 + (uint32_t)(cache->pages_dirty_leaf / 2)); retry: while (slot < max_entries) { /* |