diff options
| author | Christopher Wiley <wiley@google.com> | 2016-04-12 09:23:40 -0700 |
|---|---|---|
| committer | Christopher Wiley <wiley@google.com> | 2016-04-12 13:19:29 -0700 |
| commit | 09910f4baac4d6a5fa04eee9cce72efc73ecfdb9 (patch) | |
| tree | 922d3d6a2b127a8124a1a3cd7940a5bea99c9399 /libbinderwrapper | |
| parent | 22399089ef071d03d5e1591ae00512243f2d13ec (diff) | |
| download | system_core-09910f4baac4d6a5fa04eee9cce72efc73ecfdb9.tar.gz system_core-09910f4baac4d6a5fa04eee9cce72efc73ecfdb9.tar.bz2 system_core-09910f4baac4d6a5fa04eee9cce72efc73ecfdb9.zip | |
binderwrapper: Resolve ambiguous base::Closure reference
Disambiguate between base and android::base namespaces. This matters
when headers from libbase are indirectly included.
Bug: 27804373
Test: Compiles in that referenced situation.
Change-Id: Icb26595bb0013733aa8c03971c9f4a950c8b2ab1
Diffstat (limited to 'libbinderwrapper')
| -rw-r--r-- | libbinderwrapper/real_binder_wrapper.cc | 6 | ||||
| -rw-r--r-- | libbinderwrapper/real_binder_wrapper.h | 2 | ||||
| -rw-r--r-- | libbinderwrapper/stub_binder_wrapper.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libbinderwrapper/real_binder_wrapper.cc b/libbinderwrapper/real_binder_wrapper.cc index 1c518226d..f93f1837d 100644 --- a/libbinderwrapper/real_binder_wrapper.cc +++ b/libbinderwrapper/real_binder_wrapper.cc @@ -29,7 +29,7 @@ namespace android { // be awkward. class RealBinderWrapper::DeathRecipient : public IBinder::DeathRecipient { public: - explicit DeathRecipient(const base::Closure& callback) + explicit DeathRecipient(const ::base::Closure& callback) : callback_(callback) {} ~DeathRecipient() = default; @@ -40,7 +40,7 @@ class RealBinderWrapper::DeathRecipient : public IBinder::DeathRecipient { private: // Callback to run in response to binder death. - base::Closure callback_; + ::base::Closure callback_; DISALLOW_COPY_AND_ASSIGN(DeathRecipient); }; @@ -85,7 +85,7 @@ sp<BBinder> RealBinderWrapper::CreateLocalBinder() { bool RealBinderWrapper::RegisterForDeathNotifications( const sp<IBinder>& binder, - const base::Closure& callback) { + const ::base::Closure& callback) { sp<DeathRecipient> recipient(new DeathRecipient(callback)); if (binder->linkToDeath(recipient) != OK) { LOG(ERROR) << "Failed to register for death notifications on " diff --git a/libbinderwrapper/real_binder_wrapper.h b/libbinderwrapper/real_binder_wrapper.h index ea0837171..1675432f3 100644 --- a/libbinderwrapper/real_binder_wrapper.h +++ b/libbinderwrapper/real_binder_wrapper.h @@ -36,7 +36,7 @@ class RealBinderWrapper : public BinderWrapper { const sp<IBinder>& binder) override; sp<BBinder> CreateLocalBinder() override; bool RegisterForDeathNotifications(const sp<IBinder>& binder, - const base::Closure& callback) override; + const ::base::Closure& callback) override; bool UnregisterForDeathNotifications(const sp<IBinder>& binder) override; uid_t GetCallingUid() override; pid_t GetCallingPid() override; diff --git a/libbinderwrapper/stub_binder_wrapper.cc b/libbinderwrapper/stub_binder_wrapper.cc index 87c6ab793..8e75f6239 100644 --- a/libbinderwrapper/stub_binder_wrapper.cc +++ b/libbinderwrapper/stub_binder_wrapper.cc @@ -64,7 +64,7 @@ sp<BBinder> StubBinderWrapper::CreateLocalBinder() { bool StubBinderWrapper::RegisterForDeathNotifications( const sp<IBinder>& binder, - const base::Closure& callback) { + const ::base::Closure& callback) { death_callbacks_[binder] = callback; return true; } |