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/cpu | |
| 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/cpu')
| -rw-r--r-- | src/cpu/o3/fu_pool.cc | 5 | ||||
| -rw-r--r-- | src/cpu/o3/rob_impl.hh | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/cpu/o3/fu_pool.cc b/src/cpu/o3/fu_pool.cc index c0db5cbfc..78af428db 100644 --- a/src/cpu/o3/fu_pool.cc +++ b/src/cpu/o3/fu_pool.cc @@ -135,10 +135,7 @@ FUPool::FUPool(const Params *p) numFU++; // Add the appropriate number of copies of this FU to the list - ostringstream s; - - s << (*i)->name() << "(0)"; - fu->name = s.str(); + fu->name = (*i)->name() + "(0)"; funcUnits.push_back(fu); for (int c = 1; c < (*i)->number; ++c) { diff --git a/src/cpu/o3/rob_impl.hh b/src/cpu/o3/rob_impl.hh index 5f62ce539..b33221f15 100644 --- a/src/cpu/o3/rob_impl.hh +++ b/src/cpu/o3/rob_impl.hh @@ -404,7 +404,6 @@ template <class Impl> void ROB<Impl>::updateHead() { - DynInstPtr head_inst; InstSeqNum lowest_num = 0; bool first_valid = true; |