From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 24 Mar 2014 08:53:06 +0000 (-0700)
Subject: Fix min() parameter types after rev.13324
X-Git-Tag: SQUID_3_5_0_1~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af8694c2af33d1c5d7eb0cb12f578116f685ed41;p=thirdparty%2Fsquid.git

Fix min() parameter types after rev.13324
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 0fc2df8c3a..7b4949e2ae 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2388,7 +2388,7 @@ ConnStateData::In::maybeMakeSpaceAvailable()
             debugs(33, 4, "request buffer full: client_request_buffer_max_size=" << Config.maxRequestBufferSize);
             return false;
         }
-        const SBuf::size_type wantCapacity = min(Config.maxRequestBufferSize, haveCapacity*2);
+        const SBuf::size_type wantCapacity = min(reinterpret_cast<SBuf::size_type>(Config.maxRequestBufferSize), haveCapacity*2);
         buf.reserveCapacity(wantCapacity);
         debugs(33, 2, "growing request buffer: available=" << buf.spaceSize() << " used=" << buf.length());
     }