From 57f49debb6eb45f429c70497d8e9e2c140d31767 Mon Sep 17 00:00:00 2001
From: Ted Campbell <tcampbell@mozilla.com>
Date: Thu, 6 Dec 2018 16:34:17 +0000
Subject: [PATCH] Bug 1511672 - Fix dependent base lookups in AsyncInvoker.h
 r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D13633

--HG--
extra : moz-landing-system : lando
---
 ipc/mscom/AsyncInvoker.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ipc/mscom/AsyncInvoker.h b/ipc/mscom/AsyncInvoker.h
index 808c4064b7d0..dcc21e3cfae4 100644
--- a/ipc/mscom/AsyncInvoker.h
+++ b/ipc/mscom/AsyncInvoker.h
@@ -234,6 +234,8 @@ template <typename SyncInterface, typename AsyncInterface,
           template <typename Iface> class WaitPolicy =
               detail::FireAndForgetInvoker>
 class MOZ_RAII AsyncInvoker final : public WaitPolicy<AsyncInterface> {
+  using Base = WaitPolicy<AsyncInterface>;
+
  public:
   typedef SyncInterface SyncInterfaceT;
   typedef AsyncInterface AsyncInterfaceT;
@@ -263,7 +265,7 @@ class MOZ_RAII AsyncInvoker final : public WaitPolicy<AsyncInterface> {
       return;
     }
 
-    mAsyncCall = new AsyncCallType(callFactory);
+    this->mAsyncCall = new typename Base::AsyncCallType(callFactory);
   }
 
   /**
@@ -285,12 +287,12 @@ class MOZ_RAII AsyncInvoker final : public WaitPolicy<AsyncInterface> {
       return (mSyncObj->*aSyncMethod)(std::forward<Args>(aArgs)...);
     }
 
-    MOZ_ASSERT(mAsyncCall);
-    if (!mAsyncCall) {
+    MOZ_ASSERT(this->mAsyncCall);
+    if (!this->mAsyncCall) {
       return E_POINTER;
     }
 
-    AsyncInterface* asyncInterface = mAsyncCall->GetInterface();
+    AsyncInterface* asyncInterface = this->mAsyncCall->GetInterface();
     MOZ_ASSERT(asyncInterface);
     if (!asyncInterface) {
       return E_POINTER;