vpr: Fix variable shadow warnings
diff --git a/vpr/src/device/rr_graph_obj.cpp b/vpr/src/device/rr_graph_obj.cpp
index 7e31cd4..0cd9c49 100644
--- a/vpr/src/device/rr_graph_obj.cpp
+++ b/vpr/src/device/rr_graph_obj.cpp
@@ -371,17 +371,17 @@
* Return a vector of the edge ids
***********************************************************************/
std::vector<RREdgeId> RRGraph::find_edges(const RRNodeId& src_node, const RRNodeId& sink_node) const {
- std::vector<RREdgeId> edges;
+ std::vector<RREdgeId> matching_edges;
/* Iterate over the outgoing edges of the source node */
for (auto edge : node_out_edges(src_node)) {
if (edge_sink_node(edge) == sink_node) {
/* Update edge list to return */
- edges.push_back(edge);
+ matching_edges.push_back(edge);
}
}
- return edges;
+ return matching_edges;
}
RRNodeId RRGraph::find_node(const short& x, const short& y, const t_rr_type& type, const int& ptc, const e_side& side) const {
diff --git a/vpr/src/place/place_delay_model.cpp b/vpr/src/place/place_delay_model.cpp
index 9756c45..a7bfc67 100644
--- a/vpr/src/place/place_delay_model.cpp
+++ b/vpr/src/place/place_delay_model.cpp
@@ -140,8 +140,8 @@
return base_delay_model_.get();
}
-void OverrideDelayModel::set_base_delay_model(std::unique_ptr<DeltaDelayModel> base_delay_model) {
- base_delay_model_ = std::move(base_delay_model);
+void OverrideDelayModel::set_base_delay_model(std::unique_ptr<DeltaDelayModel> base_delay_model_obj) {
+ base_delay_model_ = std::move(base_delay_model_obj);
}
// When writing capnp targetted serialization, always allow compilation when
@@ -230,8 +230,8 @@
// FromNdMatrix is a generic function for converting a vtr::NdMatrix to a
// Matrix message. It is the mirror function of ToNdMatrix described in
// read above.
- auto delays = model.getDelays();
- FromNdMatrix<2, VprFloatEntry, float>(&delays, delays_, FromFloat);
+ auto delay_values = model.getDelays();
+ FromNdMatrix<2, VprFloatEntry, float>(&delay_values, delays_, FromFloat);
// writeMessageToFile writes message to the specified file.
writeMessageToFile(file, &builder);
