summaryrefslogtreecommitdiff
path: root/src/cpu/memtest/memtest.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2007-05-22 06:36:01 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2007-05-22 06:36:01 -0700
commit0484867d85da6c1f97c5e1c55056cf48b6b7c37d (patch)
tree552a440a3d926d2b6daa77e22add3d508319656c /src/cpu/memtest/memtest.hh
parent41dde5f6fdf195b8d51d70119737c5e3f7391f78 (diff)
parent9f1c104ccd835ce390d9e9fd24e59a6ea626ed17 (diff)
downloadgem5-0484867d85da6c1f97c5e1c55056cf48b6b7c37d.tar.xz
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2 src/mem/cache/base_cache.hh: Manual conflict resolution. --HG-- extra : convert_revision : 5ebfd7abb4f978caa88bf43d25935869edfc6b9f
Diffstat (limited to 'src/cpu/memtest/memtest.hh')
-rw-r--r--src/cpu/memtest/memtest.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/memtest/memtest.hh b/src/cpu/memtest/memtest.hh
index 84e16b98a..a6b08d61c 100644
--- a/src/cpu/memtest/memtest.hh
+++ b/src/cpu/memtest/memtest.hh
@@ -115,8 +115,8 @@ class MemTest : public MemObject
virtual void recvRetry();
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = true; }
};
CpuPort cachePort;