diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2014-10-16 05:49:59 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2014-10-16 05:49:59 -0400 |
| commit | edc77fc03cc2f9ef0fb17a34a998b2b957904c93 (patch) | |
| tree | 3f715c08e8dcf66bac6a939dcac5d8fb8506822d /src/mem | |
| parent | e6ad39adac7e77e36a294f63da47ad79ca446e93 (diff) | |
| download | gem5-edc77fc03cc2f9ef0fb17a34a998b2b957904c93.tar.xz | |
misc: Move AddrRangeList from port.hh to addr_range.hh
The new location seems like a better fit. The iterator typedefs are
removed in favour of using C++11 auto.
Diffstat (limited to 'src/mem')
| -rw-r--r-- | src/mem/port.hh | 13 | ||||
| -rw-r--r-- | src/mem/ruby/system/RubyPort.cc | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/mem/port.hh b/src/mem/port.hh index 28f4d7d68..6b5e9530c 100644 --- a/src/mem/port.hh +++ b/src/mem/port.hh @@ -50,22 +50,9 @@ #ifndef __MEM_PORT_HH__ #define __MEM_PORT_HH__ -#include <list> - #include "base/addr_range.hh" #include "mem/packet.hh" -/** - * This typedef is used to clean up getAddrRanges(). It's declared - * outside the Port object since it's also used by some mem objects. - * Eventually we should move this typedef to wherever Addr is - * defined. - */ - -typedef std::list<AddrRange> AddrRangeList; -typedef std::list<AddrRange>::iterator AddrRangeIter; -typedef std::list<AddrRange>::const_iterator AddrRangeConstIter; - class MemObject; /** diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc index b839e6646..1374c3566 100644 --- a/src/mem/ruby/system/RubyPort.cc +++ b/src/mem/ruby/system/RubyPort.cc @@ -526,8 +526,8 @@ RubyPort::PioSlavePort::getAddrRanges() const ranges.splice(ranges.begin(), ruby_port->master_ports[i]->getAddrRanges()); } - for (AddrRangeConstIter r = ranges.begin(); r != ranges.end(); ++r) - DPRINTF(RubyPort, "%s\n", r->to_string()); + for (const auto M5_VAR_USED &r : ranges) + DPRINTF(RubyPort, "%s\n", r.to_string()); return ranges; } |