Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : c8d6f2e6f590b7d1940b889bbec09e0e46f48c86
This commit is contained in:
Steve Reinhardt 2003-12-09 16:43:54 -08:00
commit 3d8cd20467

View file

@ -57,6 +57,7 @@ namespace m5 {
//
namespace __hash_namespace {
#if !defined(__LP64__)
template<>
struct hash<uint64_t> {
size_t operator()(uint64_t r) const {
@ -65,11 +66,12 @@ namespace __hash_namespace {
};
template<>
struct hash<Counter> {
size_t operator()(Counter r) const {
struct hash<int64_t> {
size_t operator()(int64_t r) const {
return r;
};
};
#endif
template<>
struct hash<std::string> {