]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix min() parameter types after rev.13324
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 24 Mar 2014 08:53:06 +0000 (01:53 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 24 Mar 2014 08:53:06 +0000 (01:53 -0700)
src/client_side.cc

index 0fc2df8c3a3e128893665e5cdb79c6e9c829189e..7b4949e2ae70a46604af82b65e09717a17b6020e 100644 (file)
@@ -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());
     }