From 3831621cb356447604dd215d51c0103e4ffa1be2 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Thu, 4 Nov 2021 09:51:11 -0400 Subject: [PATCH] Remove unpaired pragma diagnostic pop. (#11407) This was missed in https://github.com/project-chip/connectedhomeip/pull/10681 --- .../app/CHIPClientCallbacks-src.zapt | 4 - .../zap-generated/CHIPClientCallbacks.cpp | 93 ------------------- .../zap-generated/CHIPClientCallbacks.cpp | 9 -- 3 files changed, 106 deletions(-) diff --git a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt index 8f03d6b1b0bf71..a024c5ed3ea4c6 100644 --- a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt +++ b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt @@ -144,10 +144,6 @@ void {{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}ListAttribu Callback::Callback<{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}ListAttributeCallback> * cb = Callback::Callback<{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}ListAttributeCallback>::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -{{! TODO: This stack usage bit is not OK. See https://github.com/project-chip/connectedhomeip/issues/8558 }} -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ {{/if}} {{/chip_server_cluster_attributes}} diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp index 181d30ea44f299..0d5251c846b4b3 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp @@ -155,9 +155,6 @@ void ApplicationLauncherClusterApplicationLauncherListListAttributeFilter(TLV::T Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void AudioOutputClusterAudioOutputListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -179,9 +176,6 @@ void AudioOutputClusterAudioOutputListListAttributeFilter(TLV::TLVReader * tlvDa Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void BridgedActionsClusterActionListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -203,9 +197,6 @@ void BridgedActionsClusterActionListListAttributeFilter(TLV::TLVReader * tlvData Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void BridgedActionsClusterEndpointListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -227,9 +218,6 @@ void BridgedActionsClusterEndpointListListAttributeFilter(TLV::TLVReader * tlvDa Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ContentLauncherClusterAcceptsHeaderListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -251,9 +239,6 @@ void ContentLauncherClusterAcceptsHeaderListListAttributeFilter(TLV::TLVReader * Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ContentLauncherClusterSupportedStreamingTypesListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -276,9 +261,6 @@ void ContentLauncherClusterSupportedStreamingTypesListAttributeFilter(TLV::TLVRe Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void DescriptorClusterDeviceListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -300,9 +282,6 @@ void DescriptorClusterDeviceListListAttributeFilter(TLV::TLVReader * tlvData, Ca Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void DescriptorClusterServerListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -324,9 +303,6 @@ void DescriptorClusterServerListListAttributeFilter(TLV::TLVReader * tlvData, Ca Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void DescriptorClusterClientListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -348,9 +324,6 @@ void DescriptorClusterClientListListAttributeFilter(TLV::TLVReader * tlvData, Ca Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void DescriptorClusterPartsListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -372,9 +345,6 @@ void DescriptorClusterPartsListListAttributeFilter(TLV::TLVReader * tlvData, Cal Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void FixedLabelClusterLabelListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -396,9 +366,6 @@ void FixedLabelClusterLabelListListAttributeFilter(TLV::TLVReader * tlvData, Cal Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void GeneralCommissioningClusterBasicCommissioningInfoListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -423,9 +390,6 @@ void GeneralCommissioningClusterBasicCommissioningInfoListListAttributeFilter(TL Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void GeneralDiagnosticsClusterNetworkInterfacesListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -448,9 +412,6 @@ void GeneralDiagnosticsClusterNetworkInterfacesListAttributeFilter(TLV::TLVReade Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void GroupKeyManagementClusterGroupsListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -472,9 +433,6 @@ void GroupKeyManagementClusterGroupsListAttributeFilter(TLV::TLVReader * tlvData Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void GroupKeyManagementClusterGroupKeysListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -496,9 +454,6 @@ void GroupKeyManagementClusterGroupKeysListAttributeFilter(TLV::TLVReader * tlvD Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void MediaInputClusterMediaInputListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -520,9 +475,6 @@ void MediaInputClusterMediaInputListListAttributeFilter(TLV::TLVReader * tlvData Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ModeSelectClusterSupportedModesListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -544,9 +496,6 @@ void ModeSelectClusterSupportedModesListAttributeFilter(TLV::TLVReader * tlvData Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void OperationalCredentialsClusterFabricsListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -568,9 +517,6 @@ void OperationalCredentialsClusterFabricsListListAttributeFilter(TLV::TLVReader Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void OperationalCredentialsClusterTrustedRootCertificatesListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -593,9 +539,6 @@ void OperationalCredentialsClusterTrustedRootCertificatesListAttributeFilter(TLV Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void PowerSourceClusterActiveBatteryFaultsListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -617,9 +560,6 @@ void PowerSourceClusterActiveBatteryFaultsListAttributeFilter(TLV::TLVReader * t Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void TvChannelClusterTvChannelListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -641,9 +581,6 @@ void TvChannelClusterTvChannelListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void TargetNavigatorClusterTargetNavigatorListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -667,9 +604,6 @@ void TargetNavigatorClusterTargetNavigatorListListAttributeFilter(TLV::TLVReader Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void TestClusterClusterListInt8uListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -691,9 +625,6 @@ void TestClusterClusterListInt8uListAttributeFilter(TLV::TLVReader * tlvData, Ca Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void TestClusterClusterListOctetStringListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -715,9 +646,6 @@ void TestClusterClusterListOctetStringListAttributeFilter(TLV::TLVReader * tlvDa Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void TestClusterClusterListStructOctetStringListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -739,9 +667,6 @@ void TestClusterClusterListStructOctetStringListAttributeFilter(TLV::TLVReader * Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void TestClusterClusterListNullablesAndOptionalsStructListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -764,9 +689,6 @@ void TestClusterClusterListNullablesAndOptionalsStructListAttributeFilter(TLV::T Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ThreadNetworkDiagnosticsClusterNeighborTableListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -789,9 +711,6 @@ void ThreadNetworkDiagnosticsClusterNeighborTableListListAttributeFilter(TLV::TL Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ThreadNetworkDiagnosticsClusterRouteTableListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -814,9 +733,6 @@ void ThreadNetworkDiagnosticsClusterRouteTableListListAttributeFilter(TLV::TLVRe Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ThreadNetworkDiagnosticsClusterSecurityPolicyListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -839,9 +755,6 @@ void ThreadNetworkDiagnosticsClusterSecurityPolicyListAttributeFilter(TLV::TLVRe Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ThreadNetworkDiagnosticsClusterOperationalDatasetComponentsListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -867,9 +780,6 @@ void ThreadNetworkDiagnosticsClusterOperationalDatasetComponentsListAttributeFil onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void ThreadNetworkDiagnosticsClusterActiveNetworkFaultsListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -892,9 +802,6 @@ void ThreadNetworkDiagnosticsClusterActiveNetworkFaultsListListAttributeFilter(T Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ bool emberAfAccountLoginClusterGetSetupPINResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, chip::CharSpan setupPIN) diff --git a/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp index 66204a50b03fbc..949122cedd4a42 100644 --- a/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp +++ b/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp @@ -157,9 +157,6 @@ void GeneralCommissioningClusterBasicCommissioningInfoListListAttributeFilter(TL Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void OperationalCredentialsClusterFabricsListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) @@ -181,9 +178,6 @@ void OperationalCredentialsClusterFabricsListListAttributeFilter(TLV::TLVReader Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ void OperationalCredentialsClusterTrustedRootCertificatesListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, @@ -206,9 +200,6 @@ void OperationalCredentialsClusterTrustedRootCertificatesListAttributeFilter(TLV Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } -#if !defined(__clang__) -#pragma GCC diagnostic pop -#endif // __clang__ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t errorCode, chip::CharSpan debugText)