diff --git a/src/ca/caServerID.h b/src/ca/caServerID.h index 7fa80a233..348277297 100644 --- a/src/ca/caServerID.h +++ b/src/ca/caServerID.h @@ -29,12 +29,6 @@ private: ca_uint8_t pri; }; -// start with a very small server table to speed -// up the flush traverse for the frequent case - -// a small numbers of servers -static const unsigned caServerMinIndexBitWidth = 2u; -static const unsigned caServerMaxIndexBitWidth = 32u; - inline caServerID::caServerID ( const struct sockaddr_in & addrIn, unsigned priorityIn ) : addr ( addrIn ), pri ( static_cast ( priorityIn ) ) @@ -56,12 +50,18 @@ inline bool caServerID::operator == ( const caServerID & rhs ) const inline resTableIndex caServerID::hash () const { + // start with a very small server table to speed + // up the flush traverse for the frequent case - + // a small numbers of servers + const unsigned caServerMinIndexBitWidth = 2u; + const unsigned caServerMaxIndexBitWidth = 32u; + unsigned index; index = this->addr.sin_addr.s_addr; index ^= this->addr.sin_port; index ^= this->addr.sin_port >> 8u; index ^= this->pri; - return integerHash( caServerMinIndexBitWidth, + return integerHash ( caServerMinIndexBitWidth, caServerMaxIndexBitWidth, index ); } diff --git a/src/ca/inetAddrID.h b/src/ca/inetAddrID.h index 2f3e66f07..cb2d1e952 100644 --- a/src/ca/inetAddrID.h +++ b/src/ca/inetAddrID.h @@ -26,9 +26,6 @@ private: struct sockaddr_in addr; }; -static const unsigned inetAddrMinIndexBitWidth = 8u; -static const unsigned inetAddrMaxIndexBitWidth = 32u; - inline inetAddrID::inetAddrID ( const struct sockaddr_in & addrIn ) : addr ( addrIn ) { @@ -46,6 +43,8 @@ inline bool inetAddrID::operator == ( const inetAddrID &rhs ) const inline resTableIndex inetAddrID::hash () const { + const unsigned inetAddrMinIndexBitWidth = 8u; + const unsigned inetAddrMaxIndexBitWidth = 32u; unsigned index; index = this->addr.sin_addr.s_addr; index ^= this->addr.sin_port; diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h index e2cca069f..98896dd04 100644 --- a/src/libCom/cxxTemplates/resourceLib.h +++ b/src/libCom/cxxTemplates/resourceLib.h @@ -889,9 +889,6 @@ inline const char * stringId::resourceName () const return this->pStr; } -static const unsigned stringIdMinIndexWidth = CHAR_BIT; -static const unsigned stringIdMaxIndexWidth = sizeof ( unsigned ); - #ifdef instantiateRecourceLib // @@ -968,6 +965,8 @@ stringId::~stringId() // resTableIndex stringId::hash() const { + const unsigned stringIdMinIndexWidth = CHAR_BIT; + const unsigned stringIdMaxIndexWidth = sizeof ( unsigned ); const unsigned char *pUStr = reinterpret_cast < const unsigned char * > ( this->pStr ); diff --git a/src/libCom/fdmgr/fdManager.h b/src/libCom/fdmgr/fdManager.h index c162d9baa..a26918bf1 100644 --- a/src/libCom/fdmgr/fdManager.h +++ b/src/libCom/fdmgr/fdManager.h @@ -175,14 +175,13 @@ private: fdReg & operator = ( const fdReg & ); }; -static const unsigned fdManagerHashTableMinIndexBits = 8; -static const unsigned fdManagerHashTableMaxIndexBits = sizeof(SOCKET)*CHAR_BIT; - // // fdRegId::hash() // inline resTableIndex fdRegId::hash () const { + const unsigned fdManagerHashTableMinIndexBits = 8; + const unsigned fdManagerHashTableMaxIndexBits = sizeof(SOCKET)*CHAR_BIT; resTableIndex hashid; hashid = integerHash ( fdManagerHashTableMinIndexBits,