From 94b4cf5f698bb54f89aa688ee1b77e4d632f0953 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 31 Jan 2025 14:16:27 -0500 Subject: [PATCH] Fix compile error about parameter shadowing --- src/app/GlobalAttributes.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/GlobalAttributes.cpp b/src/app/GlobalAttributes.cpp index 7be3c19132ad84..9c250dfdedc795 100644 --- a/src/app/GlobalAttributes.cpp +++ b/src/app/GlobalAttributes.cpp @@ -52,10 +52,10 @@ DataModel::ActionReturnStatus ReadGlobalAttributeFromMetadata(DataModel::Provide } auto buffer = builder.TakeBuffer(); - return encoder.EncodeList([&buffer](const auto & encoder) { + return encoder.EncodeList([&buffer](const auto & listEncodeHelper) { for (auto id : buffer) { - ReturnErrorOnFailure(encoder.Encode(id)); + ReturnErrorOnFailure(listEncodeHelper.Encode(id)); } return CHIP_NO_ERROR; }); @@ -69,10 +69,10 @@ DataModel::ActionReturnStatus ReadGlobalAttributeFromMetadata(DataModel::Provide } auto buffer = builder.TakeBuffer(); - return encoder.EncodeList([&buffer](const auto & encoder) { + return encoder.EncodeList([&buffer](const auto & listEncodeHelper) { for (auto entry : buffer) { - ReturnErrorOnFailure(encoder.Encode(entry.commandId)); + ReturnErrorOnFailure(listEncodeHelper.Encode(entry.commandId)); } return CHIP_NO_ERROR; }); @@ -86,7 +86,7 @@ DataModel::ActionReturnStatus ReadGlobalAttributeFromMetadata(DataModel::Provide } auto buffer = builder.TakeBuffer(); - return encoder.EncodeList([&buffer](const auto & encoder) { + return encoder.EncodeList([&buffer](const auto & listEncodeHelper) { bool addedExtraGlobals = false; constexpr auto lastGlobalId = GlobalAttributesNotInMetadata[ArraySize(GlobalAttributesNotInMetadata) - 1]; // If EventList is not supported. The GlobalAttributesNotInMetadata is missing one id here. @@ -99,18 +99,18 @@ DataModel::ActionReturnStatus ReadGlobalAttributeFromMetadata(DataModel::Provide { for (const auto & globalId : GlobalAttributesNotInMetadata) { - ReturnErrorOnFailure(encoder.Encode(globalId)); + ReturnErrorOnFailure(listEncodeHelper.Encode(globalId)); } addedExtraGlobals = true; } - ReturnErrorOnFailure(encoder.Encode(entry.attributeId)); + ReturnErrorOnFailure(listEncodeHelper.Encode(entry.attributeId)); } if (!addedExtraGlobals) { for (auto id : GlobalAttributesNotInMetadata) { - ReturnErrorOnFailure(encoder.Encode(id)); + ReturnErrorOnFailure(listEncodeHelper.Encode(id)); } } return CHIP_NO_ERROR;