| Index: app/os_exchange_data_provider_win.cc
|
| ===================================================================
|
| --- app/os_exchange_data_provider_win.cc (revision 48060)
|
| +++ app/os_exchange_data_provider_win.cc (working copy)
|
| @@ -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 @@
|
| std::vector<FORMATETC*> contents_;
|
|
|
| // The cursor of the active enumeration - an index into |contents_|.
|
| - int cursor_;
|
| + size_t cursor_;
|
|
|
| LONG ref_count_;
|
|
|
| @@ -125,9 +125,8 @@
|
| DCHECK(count == 1);
|
|
|
| // This method copies count elements into |elements_array|.
|
| - int index = 0;
|
| - while (cursor_ < static_cast<int>(contents_.size()) &&
|
| - static_cast<ULONG>(index) < count) {
|
| + ULONG index = 0;
|
| + while (cursor_ < contents_.size() && index < count) {
|
| CloneFormatEtc(contents_.at(cursor_), &elements_array[index]);
|
| ++cursor_;
|
| ++index;
|
| @@ -144,7 +143,7 @@
|
| cursor_ += skip_count;
|
| // MSDN implies it's OK to leave the enumerator trashed.
|
| // "Whatever you say, boss"
|
| - return cursor_ <= static_cast<int>(contents_.size()) ? S_OK : S_FALSE;
|
| + return cursor_ <= contents_.size() ? S_OK : S_FALSE;
|
| }
|
|
|
| STDMETHODIMP FormatEtcEnumerator::Reset() {
|
|
|