diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 01:40:41 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 01:40:41 +0000 |
| commit | 1ac79482cc06c57fb17679398773649d4ab1c0a5 (patch) | |
| tree | 0d0506f52b2e38454207723482e04dd9d7e52e9c /base/pickle_unittest.cc | |
| parent | 099ef5dfe53b4926fa5c29cb11cd4f366ec45b83 (diff) | |
| download | chromium_src-1ac79482cc06c57fb17679398773649d4ab1c0a5.zip chromium_src-1ac79482cc06c57fb17679398773649d4ab1c0a5.tar.gz chromium_src-1ac79482cc06c57fb17679398773649d4ab1c0a5.tar.bz2 | |
more bustage fixes
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/pickle_unittest.cc')
| -rw-r--r-- | base/pickle_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/pickle_unittest.cc b/base/pickle_unittest.cc index cfa0fda..943c882 100644 --- a/base/pickle_unittest.cc +++ b/base/pickle_unittest.cc @@ -189,14 +189,15 @@ TEST(PickleTest, Resize) { // note that any data will have a 4-byte header indicating the size const size_t payload_size_after_header = unit - sizeof(uint32); Pickle pickle; - pickle.WriteData(data_ptr, payload_size_after_header - sizeof(uint32)); + pickle.WriteData(data_ptr, + static_cast<int>(payload_size_after_header - sizeof(uint32))); size_t cur_payload = payload_size_after_header; EXPECT_EQ(pickle.capacity(), unit); EXPECT_EQ(pickle.payload_size(), payload_size_after_header); // fill out a full page (noting data header) - pickle.WriteData(data_ptr, unit - sizeof(uint32)); + pickle.WriteData(data_ptr, static_cast<int>(unit - sizeof(uint32))); cur_payload += unit; EXPECT_EQ(unit * 2, pickle.capacity()); EXPECT_EQ(cur_payload, pickle.payload_size()); |