------------------------------------------------------------
revno: 13325
revision-id: squid3@treenet.co.nz-20140324085306-8qtypfx4i668bsh5
parent: squid3@treenet.co.nz-20140324045732-5u3nk1n4k8jtcrqo
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Mon 2014-03-24 01:53:06 -0700
message:
  Fix min() parameter types after rev.13324
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140324085306-8qtypfx4i668bsh5
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 4f00910458e1ac9722f1e66b816e3376cd5392d9
# timestamp: 2014-03-24 08:53:57 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140324045732-\
#   5u3nk1n4k8jtcrqo
# 
# Begin patch
=== modified file 'src/client_side.cc'
--- src/client_side.cc	2014-03-15 11:42:55 +0000
+++ src/client_side.cc	2014-03-24 08:53:06 +0000
@@ -2388,7 +2388,7 @@
             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());
     }