From d9919861f497598ae066ddf4850d9d1b2c3955c5 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 29 Oct 2002 19:08:28 +0000 Subject: [PATCH] added parens to fix borland warning --- src/ca/comBuf.h | 5 +++-- src/ca/comQueRecv.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ca/comBuf.h b/src/ca/comBuf.h index 8f429335a..1201b7797 100644 --- a/src/ca/comBuf.h +++ b/src/ca/comBuf.h @@ -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 () @@ -426,7 +426,8 @@ inline epicsUInt32 comBuf::popUInt32 () unsigned byte3 = this->buf[ this->nextReadIndex++ ]; unsigned byte4 = this->buf[ this->nextReadIndex++ ]; return static_cast < epicsUInt32 > - ( byte1 << 24u | byte2 << 16u | byte3 << 8u | byte4 ); //X aCC 392 + ( ( byte1 << 24u ) | ( byte2 << 16u ) | //X aCC 392 + ( byte3 << 8u ) | byte4 ); //X aCC 392 } #endif // ifndef comBufh diff --git a/src/ca/comQueRecv.h b/src/ca/comQueRecv.h index b61036a22..e725485d0 100644 --- a/src/ca/comQueRecv.h +++ b/src/ca/comQueRecv.h @@ -73,8 +73,8 @@ inline epicsInt8 comQueRecv::popInt8 () inline epicsInt16 comQueRecv::popInt16 () epics_throws (( comBuf::insufficentBytesAvailable )) { - return static_cast < epicsInt16 > ( this->popInt8() << 8u - | this->popInt8() << 0u ); + return static_cast < epicsInt16 > ( ( this->popInt8() << 8u ) + | ( this->popInt8() << 0u ) ); } inline epicsInt32 comQueRecv::popInt32 ()