epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed problem introduced by warning fix

Browse Source
This commit is contained in:
Jeff Hill
2002-10-30 00:36:13 +00:00
parent 784a5f815f
commit dc3bbeb16f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/comBuf.h
+1 -1
View File
@@ -412,7 +412,7 @@ inline epicsUInt16 comBuf::popUInt16 ()
}
unsigned byte1 = this->buf[ this->nextReadIndex++ ];
unsigned byte2 = this->buf[ this->nextReadIndex++ ];
return static_cast < epicsUInt16 > ( byte1 << ( 8u | byte2 ) );
return static_cast < epicsUInt16 > ( ( byte1 << 8u ) | byte2 );
}
inline epicsUInt32 comBuf::popUInt32 ()
src/ca/comQueRecv.cpp
+1 -1
View File
@@ -134,7 +134,7 @@ epicsUInt16 comQueRecv::multiBufferPopUInt16 ()
if ( this->occupiedBytes() >= sizeof (tmp) ) {
unsigned byte1 = this->popUInt8();
unsigned byte2 = this->popUInt8();
tmp = static_cast <epicsUInt16> ( byte1 << ( 8u | byte2 ) );
tmp = static_cast <epicsUInt16> ( ( byte1 << 8u ) | byte2 );
}
else {
comBuf::throwInsufficentBytesException ();