From f9c38bc22442466ac71751a81adbdbb003f9a4af Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 29 Oct 2002 23:04:10 +0000 Subject: [PATCH] fixed borland warnings --- src/ca/comQueSend.cpp | 2 +- src/ca/comQueSend.h | 5 ++--- src/libCom/osi/os/WIN32/osdThread.c | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/ca/comQueSend.cpp b/src/ca/comQueSend.cpp index 0228b3274..5ebac1b9c 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::outOfBounds )) + bool v49Ok ) epics_throws (( cacChannel::badType, cacChannel::outOfBounds )) { if ( ! this->dbr_type_ok ( dataType ) ) { throw cacChannel::badType(); diff --git a/src/ca/comQueSend.h b/src/ca/comQueSend.h index d06d0f0a5..b8b8533d4 100644 --- a/src/ca/comQueSend.h +++ b/src/ca/comQueSend.h @@ -35,8 +35,7 @@ // // Notes. -// o calling popNextComBufToSend() will clear -// any uncommitted bytes +// o calling popNextComBufToSend() will clear any uncommitted bytes // class comQueSend { public: @@ -62,7 +61,7 @@ public: 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 )); + epics_throws (( cacChannel::outOfBounds, cacChannel::badType )); void push_dbr_type ( unsigned type, const void *pVal, unsigned nElem ) epics_throws (()); comBuf * popNextComBufToSend () epics_throws (()); private: diff --git a/src/libCom/osi/os/WIN32/osdThread.c b/src/libCom/osi/os/WIN32/osdThread.c index 3deddd519..16880b21b 100644 --- a/src/libCom/osi/os/WIN32/osdThread.c +++ b/src/libCom/osi/os/WIN32/osdThread.c @@ -168,7 +168,7 @@ static unsigned osdPriorityMagFromPriorityOSI ( unsigned osiPriority, unsigned p static int epicsThreadGetOsdPriorityValue ( unsigned osiPriority ) { const DWORD priorityClass = GetPriorityClass ( GetCurrentProcess () ); - const unsigned * pStateList; + const int * pStateList; unsigned stateCount; unsigned magnitude; @@ -206,7 +206,7 @@ static unsigned osiPriorityMagFromMagnitueOSD ( unsigned magnitude, unsigned osd static unsigned epicsThreadGetOsiPriorityValue ( int osdPriority ) { const DWORD priorityClass = GetPriorityClass ( GetCurrentProcess () ); - const unsigned * pStateList; + const int * pStateList; unsigned stateCount; unsigned magnitude; @@ -459,7 +459,7 @@ static win32ThreadParam * epicsThreadParmCreate ( const char *pName ) return pParmWIN32; } -static win32ThreadParam * epicsThreadImplicitCreate () +static win32ThreadParam * epicsThreadImplicitCreate ( void ) { win32ThreadParam *pParm; char name[64];