Commit b459efb3 authored by Ben Boeckel's avatar Ben Boeckel

warnings: fix shadowing warnings

These instances are best fixed by renaming or removing the (unused)
shadowing declaration.
parent de33a297
......@@ -321,7 +321,7 @@ XdmfCurvilinearGrid::read()
// Copy stucture from read grid to this grid
copyGrid(grid);
}
else if (shared_ptr<XdmfGrid> grid = shared_dynamic_cast<XdmfGrid>(mGridController->read()))
else if (shared_dynamic_cast<XdmfGrid>(mGridController->read()))
{
XdmfError::message(XdmfError::FATAL, "Error: Grid Type Mismatch");
}
......
......@@ -115,25 +115,25 @@ XdmfDomain::populateItem(const std::map<std::string, std::string> & itemProperti
shared_dynamic_cast<XdmfGridCollection>(*iter)) {
this->insert(gridCollection);
}
else if(shared_ptr<XdmfCurvilinearGrid> grid =
else if(shared_ptr<XdmfCurvilinearGrid> curvilinear_grid =
shared_dynamic_cast<XdmfCurvilinearGrid>(*iter)) {
this->insert(grid);
this->insert(curvilinear_grid);
}
else if(shared_ptr<XdmfGraph> graph =
shared_dynamic_cast<XdmfGraph>(*iter)) {
this->insert(graph);
}
else if(shared_ptr<XdmfRectilinearGrid> grid =
else if(shared_ptr<XdmfRectilinearGrid> rect_grid =
shared_dynamic_cast<XdmfRectilinearGrid>(*iter)) {
this->insert(grid);
this->insert(rect_grid);
}
else if(shared_ptr<XdmfRegularGrid> grid =
else if(shared_ptr<XdmfRegularGrid> regular_grid =
shared_dynamic_cast<XdmfRegularGrid>(*iter)) {
this->insert(grid);
this->insert(regular_grid);
}
else if(shared_ptr<XdmfUnstructuredGrid> grid =
else if(shared_ptr<XdmfUnstructuredGrid> unstructured_grid =
shared_dynamic_cast<XdmfUnstructuredGrid>(*iter)) {
this->insert(grid);
this->insert(unstructured_grid);
}
}
}
......
......@@ -261,7 +261,7 @@ XdmfGridCollection::read()
this->insert(grid->getMap(i));
}
}
else if (shared_ptr<XdmfGrid> grid = shared_dynamic_cast<XdmfGrid>(mGridController->read()))
else if (shared_dynamic_cast<XdmfGrid>(mGridController->read()))
{
XdmfError::message(XdmfError::FATAL, "Error: Grid Type Mismatch");
}
......
......@@ -411,7 +411,7 @@ XdmfRectilinearGrid::read()
// Copy stucture from read grid to this grid
copyGrid(grid);
}
else if (shared_ptr<XdmfGrid> grid = shared_dynamic_cast<XdmfGrid>(mGridController->read()))
else if (shared_dynamic_cast<XdmfGrid>(mGridController->read()))
{
XdmfError::message(XdmfError::FATAL, "Error: Grid Type Mismatch");
}
......
......@@ -447,7 +447,7 @@ XdmfRegularGrid::read()
// Copy stucture from read grid to this grid
copyGrid(grid);
}
else if (shared_ptr<XdmfGrid> grid = shared_dynamic_cast<XdmfGrid>(mGridController->read()))
else if (shared_dynamic_cast<XdmfGrid>(mGridController->read()))
{
XdmfError::message(XdmfError::FATAL, "Error: Grid Type Mismatch");
}
......
......@@ -285,7 +285,7 @@ XdmfUnstructuredGrid::read()
{
copyGrid(grid);
}
else if (shared_ptr<XdmfGrid> grid = shared_dynamic_cast<XdmfGrid>(mGridController->read()))
else if (shared_dynamic_cast<XdmfGrid>(mGridController->read()))
{
XdmfError::message(XdmfError::FATAL, "Error: Grid Type Mismatch");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment