Merge with head.

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

diff --git a/src/base/hashmap.hh b/src/base/hashmap.hh
index 7123668291e296b8dabbc8453a65342a042a8661..b78cc02e87a10a98919696cbf628d147d34a9f5d 100644 (file)
--- a/src/base/hashmap.hh
+++ b/src/base/hashmap.hh
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
  */
 
 #ifndef __HASHMAP_HH__
@@ -57,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 {