From 0c16976e3aa4ca7957a8e6cd4baf959f66cfa1a5 Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Thu, 21 Oct 2021 15:12:49 -0700 Subject: [PATCH] =?UTF-8?q?Fix=20build=20error=20with=20ambiguous=20refere?= =?UTF-8?q?nce=20to=20=E2=80=98Messaging=E2=80=99=20(#10803)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational-credentials-server.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp index 4d32aab1694774..2715f2761c8cab 100644 --- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp +++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp @@ -313,16 +313,16 @@ void MatterOperationalCredentialsPluginServerInitCallback(void) } namespace { -class FabricCleanupExchangeDelegate : public Messaging::ExchangeDelegate +class FabricCleanupExchangeDelegate : public chip::Messaging::ExchangeDelegate { public: - CHIP_ERROR OnMessageReceived(Messaging::ExchangeContext * ec, const PayloadHeader & payloadHeader, + CHIP_ERROR OnMessageReceived(chip::Messaging::ExchangeContext * ec, const PayloadHeader & payloadHeader, System::PacketBufferHandle && payload) override { return CHIP_NO_ERROR; } - void OnResponseTimeout(Messaging::ExchangeContext * ec) override {} - void OnExchangeClosing(Messaging::ExchangeContext * ec) override + void OnResponseTimeout(chip::Messaging::ExchangeContext * ec) override {} + void OnExchangeClosing(chip::Messaging::ExchangeContext * ec) override { FabricIndex currentFabricIndex = ec->GetSecureSession().GetFabricIndex(); ec->GetExchangeMgr()->GetSessionManager()->ExpireAllPairingsForFabric(currentFabricIndex); @@ -352,8 +352,8 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(app::CommandHandle emberAfSendImmediateDefaultResponse(status); if (err == CHIP_NO_ERROR) { - Messaging::ExchangeContext * ec = commandObj->GetExchangeContext(); - FabricIndex currentFabricIndex = ec->GetSecureSession().GetFabricIndex(); + chip::Messaging::ExchangeContext * ec = commandObj->GetExchangeContext(); + FabricIndex currentFabricIndex = ec->GetSecureSession().GetFabricIndex(); if (currentFabricIndex == fabricBeingRemoved) { // If the current fabric is being removed, expiring all the secure sessions causes crashes as