From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Wed, 24 Aug 2011 08:24:20 +0000 (+0400)
Subject: Fix signed/unsigned comparison warnings in MmappedFile on some systems.
X-Git-Tag: take08~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db9958a97a7556bdd6d586af6ec12b2399dc1f1d;p=thirdparty%2Fsquid.git

Fix signed/unsigned comparison warnings in MmappedFile on some systems.
---

diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc
index a79b63bcc2..665fc8fb26 100644
--- a/src/DiskIO/Mmapped/MmappedFile.cc
+++ b/src/DiskIO/Mmapped/MmappedFile.cc
@@ -151,7 +151,7 @@ MmappedFile::read(ReadRequest *aRequest)
     assert(!error_); // TODO: propagate instead?
 
     assert(minOffset < 0 || minOffset <= aRequest->offset);
-    assert(maxOffset < 0 || aRequest->offset + aRequest->len <= (uint64_t)maxOffset);
+    assert(maxOffset < 0 || static_cast<uint64_t>(aRequest->offset + aRequest->len) <= static_cast<uint64_t>(maxOffset));
 
     Mmapping mapping(fd, aRequest->len, PROT_READ, MAP_PRIVATE | MAP_NORESERVE,
         aRequest->offset);
@@ -182,7 +182,7 @@ MmappedFile::write(WriteRequest *aRequest)
     assert(!error_); // TODO: propagate instead?
 
     assert(minOffset < 0 || minOffset <= aRequest->offset);
-    assert(maxOffset < 0 || aRequest->offset + aRequest->len <= (uint64_t)maxOffset);
+    assert(maxOffset < 0 || static_cast<uint64_t>(aRequest->offset + aRequest->len) <= static_cast<uint64_t>(maxOffset));
 
     const ssize_t written =
         pwrite(fd, aRequest->buf, aRequest->len, aRequest->offset);