Merge with head.

[gem5.git] / src / base / hashmap.hh

diff --git a/src/base/hashmap.hh b/src/base/hashmap.hh
index 570cbc152d0e1d8c31380095bb1a26061815333a..b78cc02e87a10a98919696cbf628d147d34a9f5d 100644 (file)
--- 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 {