| Index: webrtc/base/asyncinvoker.cc
|
| diff --git a/webrtc/base/asyncinvoker.cc b/webrtc/base/asyncinvoker.cc
|
| index 563ccb7afd48968e39c935f9e3f1b525309a444b..8285d5545b255427e39c42136e932c140600cd80 100644
|
| --- a/webrtc/base/asyncinvoker.cc
|
| +++ b/webrtc/base/asyncinvoker.cc
|
| @@ -36,7 +36,7 @@ void AsyncInvoker::OnMessage(Message* msg) {
|
| closure->Execute();
|
| }
|
|
|
| -void AsyncInvoker::Flush(Thread* thread, uint32 id /*= MQID_ANY*/) {
|
| +void AsyncInvoker::Flush(Thread* thread, uint32_t id /*= MQID_ANY*/) {
|
| if (destroying_) return;
|
|
|
| // Run this on |thread| to reduce the number of context switches.
|
| @@ -57,7 +57,7 @@ void AsyncInvoker::Flush(Thread* thread, uint32 id /*= MQID_ANY*/) {
|
|
|
| void AsyncInvoker::DoInvoke(Thread* thread,
|
| const scoped_refptr<AsyncClosure>& closure,
|
| - uint32 id) {
|
| + uint32_t id) {
|
| if (destroying_) {
|
| LOG(LS_WARNING) << "Tried to invoke while destroying the invoker.";
|
| return;
|
| @@ -67,8 +67,8 @@ void AsyncInvoker::DoInvoke(Thread* thread,
|
|
|
| void AsyncInvoker::DoInvokeDelayed(Thread* thread,
|
| const scoped_refptr<AsyncClosure>& closure,
|
| - uint32 delay_ms,
|
| - uint32 id) {
|
| + uint32_t delay_ms,
|
| + uint32_t id) {
|
| if (destroying_) {
|
| LOG(LS_WARNING) << "Tried to invoke while destroying the invoker.";
|
| return;
|
| @@ -85,7 +85,7 @@ GuardedAsyncInvoker::GuardedAsyncInvoker() : thread_(Thread::Current()) {
|
| GuardedAsyncInvoker::~GuardedAsyncInvoker() {
|
| }
|
|
|
| -bool GuardedAsyncInvoker::Flush(uint32 id) {
|
| +bool GuardedAsyncInvoker::Flush(uint32_t id) {
|
| rtc::CritScope cs(&crit_);
|
| if (thread_ == nullptr)
|
| return false;
|
|
|