diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
| commit | 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 (patch) | |
| tree | 2993e976c8470926d9e7f46a1da099c6045eecde /app/os_exchange_data_provider_win.cc | |
| parent | b33f1d943fd420857d9c5988ce1f4598f9a8765a (diff) | |
| download | chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.zip chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.gz chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.bz2 | |
Revert "Another dependency the bbot missed!!!"
This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98.
Revert "Missed a file as part of checkin for r48186"
This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b.
Revert "Enable warning 4389 as an error on windows builds. This will make"
This reverts commit c78936bcfc65b98edf288191d927a495b0364621.
TBR=mbelshe
Review URL: http://codereview.chromium.org/2253001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/os_exchange_data_provider_win.cc')
| -rw-r--r-- | app/os_exchange_data_provider_win.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/os_exchange_data_provider_win.cc b/app/os_exchange_data_provider_win.cc index 9429b58..b977252 100644 --- a/app/os_exchange_data_provider_win.cc +++ b/app/os_exchange_data_provider_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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<FORMATETC*> contents_; // The cursor of the active enumeration - an index into |contents_|. - size_t cursor_; + int cursor_; LONG ref_count_; @@ -125,8 +125,9 @@ STDMETHODIMP FormatEtcEnumerator::Next( DCHECK(count == 1); // This method copies count elements into |elements_array|. - ULONG index = 0; - while (cursor_ < contents_.size() && index < count) { + int index = 0; + while (cursor_ < static_cast<int>(contents_.size()) && + static_cast<ULONG>(index) < count) { CloneFormatEtc(contents_.at(cursor_), &elements_array[index]); ++cursor_; ++index; @@ -143,7 +144,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_ <= contents_.size() ? S_OK : S_FALSE; + return cursor_ <= static_cast<int>(contents_.size()) ? S_OK : S_FALSE; } STDMETHODIMP FormatEtcEnumerator::Reset() { |