diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 03:09:14 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 03:09:14 +0000 |
| commit | e7b055b2192125a85b07bcacca312d01357f9e96 (patch) | |
| tree | dc063e0aeb7284195ad7dd6b05f821ff20903740 /net/base/gzip_header.cc | |
| parent | 3fff63770514e0c178ee531308d4c3ae675b2bee (diff) | |
| download | chromium_src-e7b055b2192125a85b07bcacca312d01357f9e96.zip chromium_src-e7b055b2192125a85b07bcacca312d01357f9e96.tar.gz chromium_src-e7b055b2192125a85b07bcacca312d01357f9e96.tar.bz2 | |
Merge some changes in net/base from branches/mac_july_2008 to trunk.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/gzip_header.cc')
| -rw-r--r-- | net/base/gzip_header.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/base/gzip_header.cc b/net/base/gzip_header.cc index db810dc..8cf5df4 100644 --- a/net/base/gzip_header.cc +++ b/net/base/gzip_header.cc @@ -27,8 +27,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <minmax.h> - #include "net/base/gzip_header.h" #include "base/logging.h" @@ -125,8 +123,8 @@ GZipHeader::Status GZipHeader::ReadMore(const char* inbuf, int inbuf_len, case IN_FEXTRA: { // Grab the rest of the bytes in the extra field, or as many // of them as are actually present so far. - const int num_extra_bytes = static_cast<const int>(min( - extra_length_, + const int num_extra_bytes = static_cast<const int>(std::min( + static_cast<ptrdiff_t>(extra_length_), (end - pos))); pos += num_extra_bytes; extra_length_ -= num_extra_bytes; |