Skip to content

Commit

Permalink
Fix compile error about parameter shadowing
Browse files Browse the repository at this point in the history
  • Loading branch information
andreilitvin committed Jan 31, 2025
1 parent f56ae26 commit 94b4cf5
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/app/GlobalAttributes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
Expand All @@ -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;
});
Expand All @@ -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.
Expand All @@ -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;
Expand Down

0 comments on commit 94b4cf5

Please sign in to comment.