diff options
| -rw-r--r-- | base/waitable_event.h | 4 | ||||
| -rw-r--r-- | base/waitable_event_posix.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/base/waitable_event.h b/base/waitable_event.h index 84feedc..cff1e12 100644 --- a/base/waitable_event.h +++ b/base/waitable_event.h @@ -136,8 +136,8 @@ class WaitableEvent { // second element is the index of the WaitableEvent in the original, // unsorted, array. typedef std::pair<WaitableEvent*, size_t> WaiterAndIndex; - static unsigned EnqueueMany(WaiterAndIndex* waitables, - size_t count, Waiter* waiter); + static size_t EnqueueMany(WaiterAndIndex* waitables, + size_t count, Waiter* waiter); Lock lock_; bool signaled_; diff --git a/base/waitable_event_posix.cc b/base/waitable_event_posix.cc index f0a77fa..335f13e 100644 --- a/base/waitable_event_posix.cc +++ b/base/waitable_event_posix.cc @@ -302,9 +302,9 @@ size_t WaitableEvent::WaitMany(WaitableEvent** raw_waitables, // which was signaled, from the end of the array. // ----------------------------------------------------------------------------- // static -unsigned WaitableEvent::EnqueueMany +size_t WaitableEvent::EnqueueMany (std::pair<WaitableEvent*, size_t>* waitables, - unsigned count, Waiter* waiter) { + size_t count, Waiter* waiter) { if (!count) return 0; @@ -316,7 +316,7 @@ unsigned WaitableEvent::EnqueueMany return count; } - const unsigned r = EnqueueMany(waitables + 1, count - 1, waiter); + const size_t r = EnqueueMany(waitables + 1, count - 1, waiter); if (r) { waitables[0].first->lock_.Release(); } else { |