From 89a2c69651635f2ac67cab9c78c879ffb642a615 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Fri, 15 Jun 2001 22:45:25 +0000
Subject: [PATCH] adjust to changing hash table api

---
 src/ca/inetAddrID.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ca/inetAddrID.h b/src/ca/inetAddrID.h
index 5ebc67d07..aa1e33af9 100644
--- a/src/ca/inetAddrID.h
+++ b/src/ca/inetAddrID.h
@@ -20,7 +20,7 @@ class inetAddrID {
 public:
     inetAddrID ( const struct sockaddr_in &addrIn );
     bool operator == ( const inetAddrID & ) const;
-    resTableIndex hash ( unsigned nBitsHashIndex ) const;
+    resTableIndex hash () const;
     static unsigned maxIndexBitWidth ();
     static unsigned minIndexBitWidth ();
     void name ( char *pBuf, unsigned bufSize ) const;
@@ -28,6 +28,9 @@ private:
     const struct sockaddr_in addr;
 };
 
+static const unsigned inetAddrMinIndexBitWidth = 8u;
+static const unsigned inetAddrMaxIndexBitWidth = 32u;
+
 inline inetAddrID::inetAddrID ( const struct sockaddr_in &addrIn ) :
     addr (addrIn)
 {
@@ -43,22 +46,24 @@ inline bool inetAddrID::operator == ( const inetAddrID &rhs ) const
     return false;
 }
 
-inline resTableIndex inetAddrID::hash ( unsigned ) const
+inline resTableIndex inetAddrID::hash () const
 {
     unsigned index;
     index = this->addr.sin_addr.s_addr;
     index ^= this->addr.sin_port;
-    return intId < unsigned, 8u, 32u > :: hashEngine (index);
+    index ^= this->addr.sin_port >> 8u;
+    return integerHash < inetAddrMinIndexBitWidth,
+        inetAddrMaxIndexBitWidth > ( index );
 }
 
 inline unsigned inetAddrID::maxIndexBitWidth ()
 {
-    return 32u;
+    return inetAddrMaxIndexBitWidth;
 }
 
 inline unsigned inetAddrID::minIndexBitWidth ()
 {
-    return 8u;
+    return inetAddrMinIndexBitWidth;
 }
 
 inline void inetAddrID::name ( char *pBuf, unsigned bufSize ) const