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/hashmap.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/hashmap.hh')
-rw-r--r-- | src/base/hashmap.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/base/hashmap.hh b/src/base/hashmap.hh index 570cbc152..b78cc02e8 100644 --- a/src/base/hashmap.hh +++ b/src/base/hashmap.hh @@ -59,7 +59,7 @@ namespace m5 { // namespace __hash_namespace { -#if !defined(__LP64__) && !defined(__alpha__) +#if !defined(__LP64__) && !defined(__alpha__) && !defined(__SUNPRO_CC) template<> struct hash<uint64_t> { size_t operator()(uint64_t r) const { |