From 4feb5bd4939f178a77630023e0bdea216bfabd8b Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 29 Oct 2002 23:07:07 +0000 Subject: [PATCH] fixed borland warnings --- src/ca/comQueRecv.cpp | 5 +++-- src/ca/comQueSend.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ca/comQueRecv.cpp b/src/ca/comQueRecv.cpp index cadbcaae2..3cc680132 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 (); @@ -159,7 +159,8 @@ epicsUInt32 comQueRecv::multiBufferPopUInt32 () unsigned byte3 = this->popUInt8(); unsigned byte4 = this->popUInt8(); tmp = static_cast - ( byte1 << 24u | byte2 << 16u | byte3 << 8u | byte4 ); //X aCC 392 + ( ( byte1 << 24u ) | ( byte2 << 16u ) | + ( byte3 << 8u ) | byte4 ); //X aCC 392 } else { comBuf::throwInsufficentBytesException (); diff --git a/src/ca/comQueSend.cpp b/src/ca/comQueSend.cpp index 5ebac1b9c..e3ea7aecf 100644 --- a/src/ca/comQueSend.cpp +++ b/src/ca/comQueSend.cpp @@ -254,7 +254,7 @@ void comQueSend::insertRequestHeader ( void comQueSend::insertRequestWithPayLoad ( ca_uint16_t request, unsigned dataType, ca_uint32_t nElem, ca_uint32_t cid, ca_uint32_t requestDependent, const void * pPayload, - bool v49Ok ) epics_throws (( cacChannel::badType, cacChannel::outOfBounds )) + bool v49Ok ) epics_throws (( cacChannel::outOfBounds, cacChannel::badType )) { if ( ! this->dbr_type_ok ( dataType ) ) { throw cacChannel::badType();