diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
| commit | c10098f28be209e90277925e3f983b7e62d1d037 (patch) | |
| tree | 0b9c9f562c030ae74ae0a5fea25f804fdb84cec0 /src/mem/ruby/network | |
| parent | 860155a5fc48f983e9af40c19bf8db8250709c26 (diff) | |
| download | gem5-c10098f28be209e90277925e3f983b7e62d1d037.tar.xz | |
scons: Fix up numerous warnings about name shadowing
This patch address the most important name shadowing warnings (as
produced when using gcc/clang with -Wshadow). There are many
locations where constructor parameters and function parameters shadow
local variables, but these are left unchanged.
Diffstat (limited to 'src/mem/ruby/network')
| -rw-r--r-- | src/mem/ruby/network/orion/Crossbar/Crossbar.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/network/orion/OrionRouter.hh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc index 1ae699d55..5f0f2206d 100644 --- a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc +++ b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc @@ -306,7 +306,7 @@ double Crossbar::calc_ctr_cap(double cap_wire_, bool prev_ctr_, bool next_ctr_) //FIXME Wmemcellr and resize double Wmemcellr = m_tech_param_ptr->get_Wmemcellr(); double nsize = Wmemcellr; - double trans_cap = m_tech_param_ptr->calc_gatecap(nsize, 0); + trans_cap = m_tech_param_ptr->calc_gatecap(nsize, 0); if (m_trans_type == NP_GATE) { double Wdecinvn = m_tech_param_ptr->get_Wdecinvn(); diff --git a/src/mem/ruby/network/orion/OrionRouter.hh b/src/mem/ruby/network/orion/OrionRouter.hh index 38f808aef..ac3d2e9e1 100644 --- a/src/mem/ruby/network/orion/OrionRouter.hh +++ b/src/mem/ruby/network/orion/OrionRouter.hh @@ -98,7 +98,7 @@ class OrionRouter uint32_t m_num_out_port; uint32_t m_flit_width; uint32_t m_num_vclass; - uint32_t num_vc_per_vclass_; + uint32_t num_vc_per_vclass; uint32_t m_total_num_vc; uint32_t* m_num_vc_per_vclass_ary; uint32_t* m_in_buf_num_set_ary; |