| Index: mojo/edk/system/waiter.cc
|
| diff --git a/mojo/edk/system/waiter.cc b/mojo/edk/system/waiter.cc
|
| index 6dcd713039e95c38681581e8694e9c8156a40101..f9047cb41f7646ce9311f3b622ab4f1eed2785d7 100644
|
| --- a/mojo/edk/system/waiter.cc
|
| +++ b/mojo/edk/system/waiter.cc
|
| @@ -49,7 +49,7 @@ MojoResult Waiter::Wait(MojoDeadline deadline, uint32_t* context) {
|
| if (awoken_) {
|
| DCHECK_NE(awake_result_, MOJO_RESULT_INTERNAL);
|
| if (context)
|
| - *context = awake_context_;
|
| + *context = static_cast<uint32_t>(awake_context_);
|
| return awake_result_;
|
| }
|
|
|
| @@ -78,11 +78,11 @@ MojoResult Waiter::Wait(MojoDeadline deadline, uint32_t* context) {
|
|
|
| DCHECK_NE(awake_result_, MOJO_RESULT_INTERNAL);
|
| if (context)
|
| - *context = awake_context_;
|
| + *context = static_cast<uint32_t>(awake_context_);
|
| return awake_result_;
|
| }
|
|
|
| -void Waiter::Awake(MojoResult result, uint32_t context) {
|
| +void Waiter::Awake(MojoResult result, uintptr_t context) {
|
| base::AutoLock locker(lock_);
|
|
|
| if (awoken_)
|
|
|