diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 04:49:10 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 04:49:10 +0000 |
| commit | 74ca23f49c2396c2fae99fa461bd96a0a7ecc6e6 (patch) | |
| tree | a2b5c3a4e400e6aa681eef46cd99e95e22bcbd23 /ipc/ipc_channel_nacl.cc | |
| parent | 6246ac504ac2192f1071d706c1c682b841091a4b (diff) | |
| download | chromium_src-74ca23f49c2396c2fae99fa461bd96a0a7ecc6e6.zip chromium_src-74ca23f49c2396c2fae99fa461bd96a0a7ecc6e6.tar.gz chromium_src-74ca23f49c2396c2fae99fa461bd96a0a7ecc6e6.tar.bz2 | |
nacl: Fix a bunch of compiler warnings
BUG=148648
TBR=dmichael
Review URL: https://codereview.chromium.org/10959063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_nacl.cc')
| -rw-r--r-- | ipc/ipc_channel_nacl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc index 4231dd8..e7f11db 100644 --- a/ipc/ipc_channel_nacl.cc +++ b/ipc/ipc_channel_nacl.cc @@ -261,7 +261,7 @@ bool Channel::ChannelImpl::ProcessOutgoingMessages() { output_queue_.pop_front(); int fds[FileDescriptorSet::kMaxDescriptorsPerMessage]; - const int num_fds = msg->file_descriptor_set()->size(); + const size_t num_fds = msg->file_descriptor_set()->size(); DCHECK(num_fds <= FileDescriptorSet::kMaxDescriptorsPerMessage); msg->file_descriptor_set()->GetDescriptors(fds); @@ -302,7 +302,7 @@ Channel::ChannelImpl::ReadState Channel::ChannelImpl::ReadData( return READ_PENDING; while (!read_queue_.empty() && *bytes_read < buffer_len) { linked_ptr<std::vector<char> > vec(read_queue_.front()); - int bytes_to_read = buffer_len - *bytes_read; + size_t bytes_to_read = buffer_len - *bytes_read; if (vec->size() <= bytes_to_read) { // We can read and discard the entire vector. std::copy(vec->begin(), vec->end(), buffer + *bytes_read); |