From bd635c097dfc689674d6b21c006850a7b07f23f4 Mon Sep 17 00:00:00 2001 From: "mbelshe@chromium.org" Date: Tue, 25 May 2010 20:21:16 +0000 Subject: 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 --- app/os_exchange_data_provider_win.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'app/os_exchange_data_provider_win.cc') diff --git a/app/os_exchange_data_provider_win.cc b/app/os_exchange_data_provider_win.cc index b977252..9429b58 100644 --- a/app/os_exchange_data_provider_win.cc +++ b/app/os_exchange_data_provider_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -84,7 +84,7 @@ class FormatEtcEnumerator : public IEnumFORMATETC { std::vector contents_; // The cursor of the active enumeration - an index into |contents_|. - int cursor_; + size_t cursor_; LONG ref_count_; @@ -125,9 +125,8 @@ STDMETHODIMP FormatEtcEnumerator::Next( DCHECK(count == 1); // This method copies count elements into |elements_array|. - int index = 0; - while (cursor_ < static_cast(contents_.size()) && - static_cast(index) < count) { + ULONG index = 0; + while (cursor_ < contents_.size() && index < count) { CloneFormatEtc(contents_.at(cursor_), &elements_array[index]); ++cursor_; ++index; @@ -144,7 +143,7 @@ STDMETHODIMP FormatEtcEnumerator::Skip(ULONG skip_count) { cursor_ += skip_count; // MSDN implies it's OK to leave the enumerator trashed. // "Whatever you say, boss" - return cursor_ <= static_cast(contents_.size()) ? S_OK : S_FALSE; + return cursor_ <= contents_.size() ? S_OK : S_FALSE; } STDMETHODIMP FormatEtcEnumerator::Reset() { -- cgit v1.1