From a402601baa825459b1a18610f9c843ca8e6963ca Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Mon, 11 Nov 2024 12:14:38 +0800 Subject: [PATCH] remove the deprecated mark to fix CI issue --- src/app/data-model-provider/Provider.h | 3 +-- src/app/reporting/reporting.cpp | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/app/data-model-provider/Provider.h b/src/app/data-model-provider/Provider.h index 4bc7e7c1cb2f20..d25a117fbc394a 100644 --- a/src/app/data-model-provider/Provider.h +++ b/src/app/data-model-provider/Provider.h @@ -121,8 +121,7 @@ class Provider : public ProviderMetadataTree /// /// TODO: We should remove this function when the AttributeAccessInterface/CommandHandlerInterface is able to report /// the attribute changes. - [[deprecated("Workaround until all code can use a context object instead")]] virtual void - Temporary_ReportAttributeChanged(const AttributePathParams & path) = 0; + virtual void Temporary_ReportAttributeChanged(const AttributePathParams & path) = 0; private: InteractionModelContext mContext = { nullptr }; diff --git a/src/app/reporting/reporting.cpp b/src/app/reporting/reporting.cpp index 5ce65aa8d7d2d1..d0e07544149d6b 100644 --- a/src/app/reporting/reporting.cpp +++ b/src/app/reporting/reporting.cpp @@ -24,12 +24,6 @@ using namespace chip; using namespace chip::app; -#if defined(__GNUC__) || defined(__clang__) -// Disable the deprecated warning only for this file -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - void MatterReportingAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId) { // Attribute writes have asserted this already, but this assert should catch @@ -58,6 +52,3 @@ void MatterReportingAttributeChangeCallback(EndpointId endpoint) InteractionModelEngine::GetInstance()->GetDataModelProvider()->Temporary_ReportAttributeChanged(AttributePathParams(endpoint)); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif