summaryrefslogtreecommitdiffstats
path: root/net/tools/dump_cache/upgrade.cc
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 20:21:16 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 20:21:16 +0000
commitbd635c097dfc689674d6b21c006850a7b07f23f4 (patch)
treeb9c8bdf9edc379e288c14f64e063e29efe7635c8 /net/tools/dump_cache/upgrade.cc
parent19dc5d7922dc07b61c037ebbcc86f20dad27eab2 (diff)
downloadchromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.zip
chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.gz
chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.bz2
Enable warning 4389 as an error on windows builds. This will make
windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2081007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/dump_cache/upgrade.cc')
-rw-r--r--net/tools/dump_cache/upgrade.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tools/dump_cache/upgrade.cc b/net/tools/dump_cache/upgrade.cc
index 566eb0b..71031dc 100644
--- a/net/tools/dump_cache/upgrade.cc
+++ b/net/tools/dump_cache/upgrade.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -367,11 +367,11 @@ void MasterSM::DoGetKey(int bytes_read) {
return Fail();
std::string key(input_->buffer);
- DCHECK(key.size() == input_->msg.buffer_bytes - 1);
+ DCHECK(key.size() == static_cast<size_t>(input_->msg.buffer_bytes - 1));
if (!writer_->CreateEntry(key,
reinterpret_cast<disk_cache::Entry**>(&entry_))) {
- printf("Skipping entry \"%s\" (name conflict!)\n", key.c_str());
+ printf("Skipping entry \"%s\": %d\n", key.c_str(), GetLastError());
return SendGetPrevEntry();
}
@@ -698,7 +698,7 @@ void SlaveSM::DoGetKey() {
msg.buffer_bytes = std::min(key.size() + 1,
static_cast<size_t>(kBufferSize));
memcpy(output_->buffer, key.c_str(), msg.buffer_bytes);
- if (msg.buffer_bytes != key.size() + 1) {
+ if (msg.buffer_bytes != static_cast<int32>(key.size() + 1)) {
// We don't support moving this entry. Just tell the master.
msg.result = RESULT_NAME_OVERFLOW;
} else {