From dc3bbeb16f06c79bba559278bbc031036661382d Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 30 Oct 2002 00:36:13 +0000 Subject: [PATCH] fixed problem introduced by warning fix --- src/ca/comBuf.h | 2 +- src/ca/comQueRecv.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ca/comBuf.h b/src/ca/comBuf.h index 1201b7797..8818c3daa 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 () diff --git a/src/ca/comQueRecv.cpp b/src/ca/comQueRecv.cpp index 3cc680132..fa6efeb2b 100644 --- a/src/ca/comQueRecv.cpp +++ b/src/ca/comQueRecv.cpp @@ -134,7 +134,7 @@ epicsUInt16 comQueRecv::multiBufferPopUInt16 () if ( this->occupiedBytes() >= sizeof (tmp) ) { unsigned byte1 = this->popUInt8(); unsigned byte2 = this->popUInt8(); - tmp = static_cast ( byte1 << ( 8u | byte2 ) ); + tmp = static_cast ( ( byte1 << 8u ) | byte2 ); } else { comBuf::throwInsufficentBytesException ();