build: enable and fix -Wshadow
Shadow names can be prone to bugs. Enable the warning to avoid them in
the future. Tested by building and running the unit tests.
Change-Id: Ic3227675f4ff40d266ae2a60c66c894f16e5888e
Signed-off-by: Brad Bishop <bradbish@qti.qualcomm.com>
diff --git a/src/handler.cpp b/src/handler.cpp
index 9a5244e..902ae66 100644
--- a/src/handler.cpp
+++ b/src/handler.cpp
@@ -72,19 +72,19 @@
}
else
{
- for (const auto& interfaceMap : objectPath.second)
+ for (const auto& connectionInterfaces : objectPath.second)
{
std::vector<std::string> output(std::min(
- interfaces.size(), interfaceMap.second.size()));
+ interfaces.size(), connectionInterfaces.second.size()));
// Return iterator points at the first output elemtn,
// meaning that there are no intersections.
if (std::set_intersection(
interfaces.begin(), interfaces.end(),
- interfaceMap.second.begin(),
- interfaceMap.second.end(), output.begin()) !=
- output.begin())
+ connectionInterfaces.second.begin(),
+ connectionInterfaces.second.end(),
+ output.begin()) != output.begin())
{
- addObjectMapResult(ret, thisPath, interfaceMap);
+ addObjectMapResult(ret, thisPath, connectionInterfaces);
}
}
}
@@ -112,18 +112,19 @@
{
return pathRef->second;
}
- for (const auto& interfaceMap : pathRef->second)
+ for (const auto& connectionInterfaces : pathRef->second)
{
std::vector<std::string> output(
- std::min(interfaces.size(), interfaceMap.second.size()));
+ std::min(interfaces.size(), connectionInterfaces.second.size()));
// Return iterator points at the first output elemtn,
// meaning that there are no intersections.
if (std::set_intersection(interfaces.begin(), interfaces.end(),
- interfaceMap.second.begin(),
- interfaceMap.second.end(), output.begin()) !=
- output.begin())
+ connectionInterfaces.second.begin(),
+ connectionInterfaces.second.end(),
+ output.begin()) != output.begin())
{
- results.emplace(interfaceMap.first, interfaceMap.second);
+ results.emplace(connectionInterfaces.first,
+ connectionInterfaces.second);
}
}
@@ -183,20 +184,20 @@
thisPath.end(), '/');
if (thisDepth <= depth)
{
- for (const auto& interfaceMap : objectPath.second)
+ for (const auto& connectionInterfaces : objectPath.second)
{
std::vector<std::string> output(std::min(
- interfaces.size(), interfaceMap.second.size()));
+ interfaces.size(), connectionInterfaces.second.size()));
// Return iterator points at the first output elemtn,
// meaning that there are no intersections.
if (std::set_intersection(
interfaces.begin(), interfaces.end(),
- interfaceMap.second.begin(),
- interfaceMap.second.end(),
+ connectionInterfaces.second.begin(),
+ connectionInterfaces.second.end(),
output.begin()) != output.begin() ||
interfaces.empty())
{
- addObjectMapResult(ret, thisPath, interfaceMap);
+ addObjectMapResult(ret, thisPath, connectionInterfaces);
}
}
}
@@ -254,17 +255,17 @@
if (thisDepth <= depth)
{
bool add = interfaces.empty();
- for (const auto& interfaceMap : objectPath.second)
+ for (const auto& connectionInterfaces : objectPath.second)
{
std::vector<std::string> output(std::min(
- interfaces.size(), interfaceMap.second.size()));
+ interfaces.size(), connectionInterfaces.second.size()));
// Return iterator points at the first output elemtn,
// meaning that there are no intersections.
if (std::set_intersection(
interfaces.begin(), interfaces.end(),
- interfaceMap.second.begin(),
- interfaceMap.second.end(), output.begin()) !=
- output.begin())
+ connectionInterfaces.second.begin(),
+ connectionInterfaces.second.end(),
+ output.begin()) != output.begin())
{
add = true;
break;
@@ -388,14 +389,15 @@
}
if (thisPath.starts_with(objectPath))
{
- for (const auto& interfaceMap : path.second)
+ for (const auto& connectionInterfaces : path.second)
{
- std::vector<std::string> tempoutput(
- std::min(interfaces.size(), interfaceMap.second.size()));
- if (std::set_intersection(
- interfaces.begin(), interfaces.end(),
- interfaceMap.second.begin(), interfaceMap.second.end(),
- tempoutput.begin()) != tempoutput.begin())
+ std::vector<std::string> tempoutput(std::min(
+ interfaces.size(), connectionInterfaces.second.size()));
+ if (std::set_intersection(interfaces.begin(), interfaces.end(),
+ connectionInterfaces.second.begin(),
+ connectionInterfaces.second.end(),
+ tempoutput.begin()) !=
+ tempoutput.begin())
{
output.emplace_back(thisPath);
break;