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

fixed borland warnings

Browse Source
This commit is contained in:
Jeff Hill
2002-10-29 23:07:07 +00:00
parent f9c38bc224
commit 4feb5bd493
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ca/comQueRecv.cpp
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 ();
@@ -159,7 +159,8 @@ epicsUInt32 comQueRecv::multiBufferPopUInt32 ()
unsigned byte3 = this->popUInt8();
unsigned byte4 = this->popUInt8();
tmp = static_cast <epicsUInt32>
( byte1 << 24u | byte2 << 16u | byte3 << 8u | byte4 ); //X aCC 392
( ( byte1 << 24u ) | ( byte2 << 16u ) |
( byte3 << 8u ) | byte4 ); //X aCC 392
}
else {
comBuf::throwInsufficentBytesException ();

2
src/ca/comQueSend.cpp
View File

@@ -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();