From a80f2237360f793d7e03cbb148f30bc9e19007bd Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 23 Oct 1998 00:28:21 +0000 Subject: [PATCH] fixed HP-UX warnings --- src/cas/generic/caServerI.cc | 12 ++++++++++++ src/cas/generic/casEventMask.h | 15 +++++++++------ src/cas/generic/casInternal.h | 9 ++++++--- src/cas/generic/casMonEventIL.h | 7 +++++-- src/cas/generic/server.h | 28 ++++++++++++++-------------- 5 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/cas/generic/caServerI.cc b/src/cas/generic/caServerI.cc index 74c8ea3d9..5b493998b 100644 --- a/src/cas/generic/caServerI.cc +++ b/src/cas/generic/caServerI.cc @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.11 1998/05/29 20:13:42 jhill + * made assert() call portable to 64 bit arch + * * Revision 1.10 1998/02/18 22:44:44 jhill * fixed warning * @@ -391,3 +394,12 @@ void caServerI::sendBeacon() this->advanceBeaconPeriod(); } +// +// casEventRegistry::~casEventRegistry() +// +// (must not be inline because it is virtual) +// +casEventRegistry::~casEventRegistry() +{ + this->destroyAllEntries(); +} diff --git a/src/cas/generic/casEventMask.h b/src/cas/generic/casEventMask.h index e7517d8f1..858b264e2 100644 --- a/src/cas/generic/casEventMask.h +++ b/src/cas/generic/casEventMask.h @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.6 1997/08/05 00:47:08 jhill + * fixed warnings + * * Revision 1.5 1997/04/10 19:34:08 jhill * API changes * @@ -71,9 +74,9 @@ public: this->mask = 0u; } - casEventMask (casEventRegistry ®, const char *pName); + casEventMask (casEventRegistry ®, const char *pName); - casEventMask () + casEventMask () { this->clear(); } @@ -89,11 +92,11 @@ public: return this->mask==0u; } - inline void operator|= (const casEventMask &rhs); - inline void operator&= (const casEventMask &rhs); - + inline void operator|= (const casEventMask &rhs); + inline void operator&= (const casEventMask &rhs); + private: - unsigned mask; + unsigned mask; }; inline casEventMask operator| (const casEventMask &lhs, const casEventMask &rhs) diff --git a/src/cas/generic/casInternal.h b/src/cas/generic/casInternal.h index 32a0fc487..7287d0bbd 100644 --- a/src/cas/generic/casInternal.h +++ b/src/cas/generic/casInternal.h @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.16 1998/07/08 15:38:05 jhill + * fixed lost monitors during flow control problem + * * Revision 1.15 1998/06/16 02:26:09 jhill * allow PVs to exist without a server * @@ -143,7 +146,7 @@ private: class ioBlockedList : private tsDLList { public: ioBlockedList (); - ~ioBlockedList (); + virtual ~ioBlockedList (); void signal (); void removeItemFromIOBLockedList(ioBlocked &item); void addItemToIOBLockedList(ioBlocked &item); @@ -162,7 +165,7 @@ public: // inline casMonEvent (); inline casMonEvent (casMonitor &monitor, gdd &newValue); - inline casMonEvent (casMonEvent &initValue); + inline casMonEvent (const casMonEvent &initValue); // // ~casMonEvent () @@ -177,7 +180,7 @@ public: // inline gdd *getValue() const; - inline void operator = (class casMonEvent &monEventIn); + inline void operator = (const class casMonEvent &monEventIn); inline void clear(); diff --git a/src/cas/generic/casMonEventIL.h b/src/cas/generic/casMonEventIL.h index e1eac89b9..64aa2e6d7 100644 --- a/src/cas/generic/casMonEventIL.h +++ b/src/cas/generic/casMonEventIL.h @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.4 1998/06/16 02:27:53 jhill + * use smart gdd ptr + * * Revision 1.3 1997/04/10 19:34:11 jhill * API changes * @@ -61,14 +64,14 @@ inline casMonEvent::casMonEvent (casMonitor &monitor, gdd &newValue) : // // casMonEvent::casMonEvent() // -inline casMonEvent::casMonEvent (casMonEvent &initValue) : +inline casMonEvent::casMonEvent (const casMonEvent &initValue) : pValue(initValue.pValue), id(initValue.id) {} // // casMonEvent::operator = () // -inline void casMonEvent::operator = (class casMonEvent &monEventIn) +inline void casMonEvent::operator = (const class casMonEvent &monEventIn) { this->pValue = monEventIn.pValue; this->id = monEventIn.id; diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h index e119da478..c91b857ac 100644 --- a/src/cas/generic/server.h +++ b/src/cas/generic/server.h @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.26 1998/09/24 20:41:49 jhill + * supply resource id to logBadIdWithFileAndLineno() + * * Revision 1.25 1998/07/08 15:38:08 jhill * fixed lost monitors during flow control problem * @@ -244,9 +247,9 @@ private: class casClientMon : public casMonitor { public: casClientMon(casChannelI &, caResId clientId, - const unsigned long count, const unsigned type, - const casEventMask &maskIn, osiMutex &mutexIn); - ~casClientMon(); + const unsigned long count, const unsigned type, + const casEventMask &maskIn, osiMutex &mutexIn); + virtual ~casClientMon(); caStatus callBack(gdd &value); @@ -393,9 +396,9 @@ enum casFlushRequest{ class outBuf { public: - outBuf (osiMutex &, unsigned bufSizeIn); + outBuf (osiMutex &, unsigned bufSizeIn); caStatus init(); //constructor does not return status - virtual ~outBuf()=0; + virtual ~outBuf()=0; inline bufSizeT bytesPresent() const; @@ -473,10 +476,10 @@ private: class casCoreClient : public osiMutex, public ioBlocked, public casEventSys { -// -// allows casAsyncIOI constructor to check for asynch IO duplicates -// -friend casAsyncIOI::casAsyncIOI(casCoreClient &clientIn, casAsyncIO &ioExternalIn); + // + // allows casAsyncIOI constructor to check for asynch IO duplicates + // + friend casAsyncIOI::casAsyncIOI(casCoreClient &clientIn, casAsyncIO &ioExternalIn); public: casCoreClient(caServerI &serverInternal); @@ -647,7 +650,7 @@ class casStrmClient : public inBuf, public outBuf, public casClient, public: casStrmClient (caServerI &cas); caStatus init(); //constructor does not return status - ~casStrmClient(); + virtual ~casStrmClient(); void show (unsigned level) const; @@ -854,10 +857,7 @@ public: int init(); - ~casEventRegistry() - { - this->destroyAllEntries(); - } + virtual ~casEventRegistry(); casEventMask registerEvent (const char *pName);