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

upgraded compiler specific macros

Browse Source
This commit is contained in:
Jeff Hill
2002-10-30 18:29:40 +00:00
parent 0dce06f4cf
commit d4cb389a5d
28 changed files with 252 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/ca/comQueSend.cpp
View File

@@ -81,35 +81,31 @@ const char cacNillBytes [] =
};
comQueSend::comQueSend ( wireSendAdapter & wireIn,
comBufMemoryManager & comBufMemMgrIn ) epics_throws (()) :
comBufMemoryManager & comBufMemMgrIn ) epicsThrows (()) :
comBufMemMgr ( comBufMemMgrIn ), wire ( wireIn ),
nBytesPending ( 0u )
{
}
comQueSend::~comQueSend () epics_throws (())
comQueSend::~comQueSend () epicsThrows (())
{
this->clear ();
}
void comQueSend::clear () epics_throws (())
void comQueSend::clear () epicsThrows (())
{
comBuf *pBuf;
while ( ( pBuf = this->bufs.get () ) ) {
this->nBytesPending -= pBuf->occupiedBytes ();
pBuf->~comBuf ();
# if defined ( CXX_PLACEMENT_DELETE ) && 0
comBuf::operator delete ( pBuf, this->comBufMemMgr );
# else
this->comBufMemMgr.release ( pBuf );
# endif
this->comBufMemMgr.release ( pBuf );
}
this->pFirstUncommited = tsDLIter < comBuf > ();
assert ( this->nBytesPending == 0 );
}
void comQueSend::clearUncommitted () epics_throws (())
void comQueSend::clearUncommitted () epicsThrows (())
{
while ( this->pFirstUncommited.valid() ) {
tsDLIter < comBuf > next = this->pFirstUncommited;
@@ -118,43 +114,38 @@ void comQueSend::clearUncommitted () epics_throws (())
if ( this->pFirstUncommited->occupiedBytes() == 0u ) {
this->bufs.remove ( *this->pFirstUncommited );
this->pFirstUncommited->~comBuf ();
# if defined ( CXX_PLACEMENT_DELETE ) && 0
comBuf::operator delete
( this->pFirstUncommited.pointer(), this->comBufMemMgr );
# else
this->comBufMemMgr.release ( this->pFirstUncommited.pointer() );
# endif
this->comBufMemMgr.release ( this->pFirstUncommited.pointer() );
}
this->pFirstUncommited = next;
}
}
void comQueSend::copy_dbr_string ( const void *pValue, unsigned nElem ) epics_throws (())
void comQueSend::copy_dbr_string ( const void *pValue, unsigned nElem ) epicsThrows (())
{
this->push ( static_cast <const dbr_string_t *> ( pValue ), nElem );
}
void comQueSend::copy_dbr_short ( const void *pValue, unsigned nElem ) epics_throws (())
void comQueSend::copy_dbr_short ( const void *pValue, unsigned nElem ) epicsThrows (())
{
this->push ( static_cast <const dbr_short_t *> ( pValue ), nElem );
}
void comQueSend::copy_dbr_float ( const void *pValue, unsigned nElem ) epics_throws (())
void comQueSend::copy_dbr_float ( const void *pValue, unsigned nElem ) epicsThrows (())
{
this->push ( static_cast <const dbr_float_t *> ( pValue ), nElem );
}
void comQueSend::copy_dbr_char ( const void *pValue, unsigned nElem ) epics_throws (())
void comQueSend::copy_dbr_char ( const void *pValue, unsigned nElem ) epicsThrows (())
{
this->push ( static_cast <const dbr_char_t *> ( pValue ), nElem );
}
void comQueSend::copy_dbr_long ( const void *pValue, unsigned nElem ) epics_throws (())
void comQueSend::copy_dbr_long ( const void *pValue, unsigned nElem ) epicsThrows (())
{
this->push ( static_cast <const dbr_long_t *> ( pValue ), nElem );
}
void comQueSend::copy_dbr_double ( const void *pValue, unsigned nElem ) epics_throws (())
void comQueSend::copy_dbr_double ( const void *pValue, unsigned nElem ) epicsThrows (())
{
this->push ( static_cast <const dbr_double_t *> ( pValue ), nElem );
}
@@ -201,7 +192,7 @@ const comQueSend::copyFunc_t comQueSend::dbrCopyVector [39] = {
0 // DBR_CLASS_NAME
};
comBuf * comQueSend::popNextComBufToSend () epics_throws (())
comBuf * comQueSend::popNextComBufToSend () epicsThrows (())
{
comBuf *pBuf = this->bufs.get ();
if ( pBuf ) {
@@ -225,7 +216,7 @@ void comQueSend::insertRequestHeader (
ca_uint16_t request, ca_uint32_t payloadSize,
ca_uint16_t dataType, ca_uint32_t nElem, ca_uint32_t cid,
ca_uint32_t requestDependent, bool v49Ok )
epics_throws (( cacChannel::outOfBounds ))
epicsThrows (( cacChannel::outOfBounds ))
{
this->beginMsg ();
if ( payloadSize < 0xffff && nElem < 0xffff ) {
@@ -254,7 +245,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::outOfBounds, cacChannel::badType ))
bool v49Ok ) epicsThrows (( cacChannel::outOfBounds, cacChannel::badType ))
{
if ( ! this->dbr_type_ok ( dataType ) ) {
throw cacChannel::badType();
@@ -299,7 +290,7 @@ void comQueSend::insertRequestWithPayLoad (
this->commitMsg ();
}
void comQueSend::commitMsg () epics_throws (())
void comQueSend::commitMsg () epicsThrows (())
{
while ( this->pFirstUncommited.valid() ) {
this->nBytesPending += this->pFirstUncommited->uncommittedBytes ();