diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index 1d8ef7fad..1e9d99253 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -980,8 +980,8 @@ void cac::writeRequest ( nciu &chan, unsigned type, unsigned nElem, const void * } cacChannel::ioid -cac::writeNotifyRequest ( nciu &chan, unsigned type, unsigned nElem, // X aCC 361 - const void *pValue, cacWriteNotify ¬ifyIn ) +cac::writeNotifyRequest ( nciu &chan, unsigned type, // X aCC 361 + unsigned nElem, const void *pValue, cacWriteNotify ¬ifyIn ) { epicsAutoMutex autoMutex ( this->mutex ); autoPtrRecycle < netWriteNotifyIO > pIO ( this->ioTable, chan.cacPrivateListOfIO::eventq, diff --git a/src/ca/comBuf.h b/src/ca/comBuf.h index ac1676a43..3d843e64b 100644 --- a/src/ca/comBuf.h +++ b/src/ca/comBuf.h @@ -1,15 +1,14 @@ - -/* +/* * $Id$ * - * + * * L O S A L A M O S * Los Alamos National Laboratory * Los Alamos, New Mexico 87545 - * + * * Copyright, 1986, The Regents of the University of California. - * - * + * + * * Author Jeffrey O. Hill * johill@lanl.gov */ @@ -364,13 +363,13 @@ inline comBuf::statusPopUInt32 comBuf::popUInt32 () statusPopUInt32 tmp; if ( this->occupiedBytes () >= 4u ) { unsigned tmpByte = this->buf[ this->nextReadIndex++ ]; - tmp.val = static_cast < epicsUInt32 > ( tmpByte << 24u ); + tmp.val = tmpByte << 24u; + tmpByte = this->buf[ this->nextReadIndex++ ]; + tmp.val |= tmpByte << 16u; tmpByte = this->buf[ this->nextReadIndex++ ]; - tmp.val |= static_cast < epicsUInt32 > ( tmpByte << 16u ); + tmp.val |= tmpByte << 8u; tmpByte = this->buf[ this->nextReadIndex++ ]; - tmp.val |= static_cast < epicsUInt32 > ( tmpByte << 8u ); - tmpByte = this->buf[ this->nextReadIndex++ ]; - tmp.val |= static_cast < epicsUInt32 > ( tmpByte ); + tmp.val |= tmpByte; tmp.success = true; } else { diff --git a/src/ca/comQueRecv.cpp b/src/ca/comQueRecv.cpp index 85e2be46a..0a681923f 100644 --- a/src/ca/comQueRecv.cpp +++ b/src/ca/comQueRecv.cpp @@ -1,15 +1,14 @@ - /* * $Id$ * - * + * * L O S A L A M O S * Los Alamos National Laboratory * Los Alamos, New Mexico 87545 - * + * * Copyright, 1986, The Regents of the University of California. - * - * + * + * * Author Jeffrey O. Hill * johill@lanl.gov */ @@ -136,8 +135,8 @@ epicsUInt16 comQueRecv::popUInt16 () } else { // split between buffers runs slower - tmp = static_cast ( this->popUInt8() << 8u ); - tmp |= static_cast ( this->popUInt8() << 0u ); + tmp = this->popUInt8() << 8u; // X aCC 818 + tmp |= this->popUInt8() << 0u; // X aCC 818 } return tmp; } diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h index c301795d8..0b0ba937b 100644 --- a/src/libCom/cxxTemplates/resourceLib.h +++ b/src/libCom/cxxTemplates/resourceLib.h @@ -273,7 +273,7 @@ inline unsigned resTable::resTableBitMask ( const unsigned nBits ) // remove a res from the resTable // template -T * resTable::remove ( const ID &idIn ) +T * resTable::remove ( const ID &idIn ) // X aCC 361 { if ( this->pTable ) { // search list for idIn and remove the first match @@ -306,7 +306,7 @@ T * resTable::remove ( const ID &idIn ) // resTable::lookup () // template -inline T * resTable::lookup ( const ID &idIn ) const +inline T * resTable::lookup ( const ID &idIn ) const // X aCC 361 { if ( this->pTable ) { tsSLList & list = this->pTable [ this->hash ( idIn ) ]; @@ -475,7 +475,7 @@ inline unsigned resTable::numEntriesInstalled () const } template -inline unsigned resTable::tableSize () const +inline unsigned resTable::tableSize () const // X aCC 361 { if ( this->pTable ) { return ( this->hashIxMask + 1 ) + this->nextSplitIndex;