From cb290a117ae17961c9e43e5fe76bb3edb2ed7efa Mon Sep 17 00:00:00 2001 From: Adam Crume Date: Fri, 17 Oct 2014 12:09:44 -0700 Subject: [PATCH] osdc: Fix compiler warning Was getting: ./osdc/ObjectCacher.h:169:51: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] uint64_t overlap_start = MAX(start, ex.start); ^ ./osdc/ObjectCacher.h:170:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] uint64_t overlap_end = MIN(end, ex.start + ex.length); ^ Signed-off-by: Adam Crume --- src/osdc/ObjectCacher.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h index d4e7bde481357..4fa602f6889f0 100644 --- a/src/osdc/ObjectCacher.h +++ b/src/osdc/ObjectCacher.h @@ -166,8 +166,10 @@ class ObjectCacher { //! Returns the size of the overlap between the BufferHead's range and the given range. uint64_t overlap_size(uint64_t start, uint64_t end) { - uint64_t overlap_start = MAX(start, ex.start); - uint64_t overlap_end = MIN(end, ex.start + ex.length); + assert(ex.start >= 0); + assert(ex.length >= 0); + uint64_t overlap_start = MAX(start, (uint64_t)ex.start); + uint64_t overlap_end = MIN(end, (uint64_t)(ex.start + ex.length)); return overlap_end - overlap_start; } }; -- 2.39.5