diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:50:28 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:50:28 -0500 |
| commit | 6d9d0c68b574ceba53fc36d34b83f7109e00b1d0 (patch) | |
| tree | 8004fcb5879cd81d738bd750441fbc900208e049 /src/base/hashmap.hh | |
| parent | c215d54aac6925cf13079d8d8fe3691451a77ce1 (diff) | |
| parent | fd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f (diff) | |
| download | gem5-6d9d0c68b574ceba53fc36d34b83f7109e00b1d0.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.suncc
--HG--
extra : convert_revision : 1706f6218abec7eb575dcff3ad4aef83894f64ab
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 { |