diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:49:40 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:49:40 -0500 |
| commit | fd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f (patch) | |
| tree | ce2a5d4e12142eab64231daab73953a15384b7c6 /src/base/timebuf.hh | |
| parent | 8561c8366c7c9afd7e6b52b6e2385b3c1dde95a9 (diff) | |
| parent | 63fdabf191b8ac1031fb25da61ab2526d4bb6d05 (diff) | |
| download | gem5-fd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f.tar.xz | |
Merge zeep.pool:/z/saidi/work/m5.newmem
into zeep.pool:/z/saidi/work/m5.suncc
--HG--
extra : convert_revision : 20f61a524a3b53fc0afcf53a24b5a1fe1d96f579
Diffstat (limited to 'src/base/timebuf.hh')
| -rw-r--r-- | src/base/timebuf.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/base/timebuf.hh b/src/base/timebuf.hh index 1d0de8278..348f7a673 100644 --- a/src/base/timebuf.hh +++ b/src/base/timebuf.hh @@ -33,6 +33,7 @@ #define __BASE_TIMEBUF_HH__ #include <cassert> +#include <cstring> #include <vector> template <class T> @@ -143,7 +144,7 @@ class TimeBuffer char *ptr = data; for (int i = 0; i < size; i++) { index[i] = ptr; - memset(ptr, 0, sizeof(T)); + std::memset(ptr, 0, sizeof(T)); new (ptr) T; ptr += sizeof(T); } @@ -171,7 +172,7 @@ class TimeBuffer if (ptr >= size) ptr -= size; (reinterpret_cast<T *>(index[ptr]))->~T(); - memset(index[ptr], 0, sizeof(T)); + std::memset(index[ptr], 0, sizeof(T)); new (index[ptr]) T; } |