From 8874a29844bbe32fc57ab0f0bb333a02e37ae7d4 Mon Sep 17 00:00:00 2001 From: reuk Date: Wed, 1 Nov 2023 11:43:03 +0000 Subject: [PATCH] CapabilityInquiryDemo: Fix variable shadowing warnings --- examples/Audio/CapabilityInquiryDemo.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/Audio/CapabilityInquiryDemo.h b/examples/Audio/CapabilityInquiryDemo.h index 9aeefb79a7..909fc2245d 100644 --- a/examples/Audio/CapabilityInquiryDemo.h +++ b/examples/Audio/CapabilityInquiryDemo.h @@ -3771,9 +3771,9 @@ private: { const auto& [muid, propName] = *details; - const auto encodingToUse = [&, muid = muid, propName = propName]() -> std::optional + const auto encodingToUse = [&, muidCopy = muid, propNameCopy = propName]() -> std::optional { - if (auto* deviceResource = findDeviceResource (appState->transient, muid, propName)) + if (auto* deviceResource = findDeviceResource (appState->transient, muidCopy, propNameCopy)) return deviceResource->getBestCommonEncoding(); return {}; @@ -3805,9 +3805,9 @@ private: { const auto& [muid, propName] = *details; - const auto encodingToUse = [&, muid = muid, propName = propName]() -> std::optional + const auto encodingToUse = [&, muidCopy = muid, propNameCopy = propName]() -> std::optional { - if (auto* deviceResource = findDeviceResource (appState->transient, muid, propName)) + if (auto* deviceResource = findDeviceResource (appState->transient, muidCopy, propNameCopy)) return deviceResource->getBestCommonEncoding(); return {}; @@ -3860,12 +3860,12 @@ private: const auto& [muid, propName] = *details; - const auto subId = [&, propName = propName] + const auto subId = [&, propNameCopy = propName] { const auto ongoing = device->getOngoingSubscriptionsForMuid (selectedDevice->muid); const auto iter = std::find_if (ongoing.begin(), ongoing.end(), [&] (const auto& sub) { - return sub.resource == propName; + return sub.resource == propNameCopy; }); return iter != ongoing.end() ? iter->subscribeId : String(); @@ -4559,11 +4559,11 @@ private: auto group = msg.group; auto time = Time::getCurrentTime(); - MessageManager::callAsync ([weak, bytes = std::move (bytes), group, time] + MessageManager::callAsync ([weak, movedBytes = std::move (bytes), group, time] { // This call is async because we may send messages in direct response to model updates. if (weak != nullptr) - weak->addLogEntry ({ group, bytes }, Model::MessageKind::outgoing, time); + weak->addLogEntry ({ group, movedBytes }, Model::MessageKind::outgoing, time); }); if (auto* out = demo.output.get())