diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-29 17:35:51 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-29 17:35:51 -0500 |
| commit | 1e4e989b8396b9f4f322fb27bbfa1cf9e2007334 (patch) | |
| tree | 236034318170bd70925abaecaeee398b7b9bb7e9 /base/timebuf.hh | |
| parent | 76daf50937abda24d46a44754e2793570fc624b4 (diff) | |
| parent | d46d3d6811822d218c137cd6d991e6b4981811d6 (diff) | |
| download | gem5-1e4e989b8396b9f4f322fb27bbfa1cf9e2007334.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 984b015700ccef71d95b4d7d775a7b3f24084dc6
Diffstat (limited to 'base/timebuf.hh')
| -rw-r--r-- | base/timebuf.hh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/base/timebuf.hh b/base/timebuf.hh index 435803fae..f6b5b2781 100644 --- a/base/timebuf.hh +++ b/base/timebuf.hh @@ -31,8 +31,6 @@ #include <vector> -using namespace std; - template <class T> class TimeBuffer { @@ -42,7 +40,7 @@ class TimeBuffer int size; char *data; - vector<char *> index; + std::vector<char *> index; int base; void valid(int idx) |