diff --git a/src/cas/generic/caServer.cc b/src/cas/generic/caServer.cc index 3f4d34725..f17becee2 100644 --- a/src/cas/generic/caServer.cc +++ b/src/cas/generic/caServer.cc @@ -182,9 +182,9 @@ class epicsTimer & caServer::createTimer () // // caServer::subscriptionEventsProcessed // -epicsShareFunc unsigned caServer::subscriptionEventsProcessed (void) const // X aCC 361 +epicsShareFunc unsigned caServer::subscriptionEventsProcessed () const // X aCC 361 { - if (pCAS) { + if ( pCAS ) { return this->pCAS->subscriptionEventsProcessed(); } else { @@ -195,9 +195,9 @@ epicsShareFunc unsigned caServer::subscriptionEventsProcessed (void) const // X // // caServer::subscriptionEventsPosted // -epicsShareFunc unsigned caServer::subscriptionEventsPosted (void) const // X aCC 361 +epicsShareFunc unsigned caServer::subscriptionEventsPosted () const // X aCC 361 { - if (pCAS) { + if ( pCAS ) { return this->pCAS->subscriptionEventsPosted (); } else { diff --git a/src/cas/generic/caServerIIL.h b/src/cas/generic/caServerIIL.h index ef8ed33e1..f0819687b 100644 --- a/src/cas/generic/caServerIIL.h +++ b/src/cas/generic/caServerIIL.h @@ -128,33 +128,33 @@ inline casEventMask caServerI::alarmEventMask() const } // -// caServerI::subscriptionEventsProcessedCounter (void) const +// caServerI::subscriptionEventsProcessedCounter () const // -inline unsigned caServerI::subscriptionEventsProcessed (void) const +inline unsigned caServerI::subscriptionEventsProcessed () const { return this->nEventsProcessed; } // -// caServerI::incrEventsProcessedCounter (void) +// caServerI::incrEventsProcessedCounter () // -inline void caServerI::incrEventsProcessedCounter (void) +inline void caServerI::incrEventsProcessedCounter () { this->nEventsProcessed++; } // -// caServerI::subscriptionEventsPosted (void) const +// caServerI::subscriptionEventsPosted () const // -inline unsigned caServerI::subscriptionEventsPosted (void) const +inline unsigned caServerI::subscriptionEventsPosted () const { return this->nEventsPosted; } // -// caServerI::incEventsPostedCounter (void) +// caServerI::incEventsPostedCounter () // -inline void caServerI::incrEventsPostedCounter (void) +inline void caServerI::incrEventsPostedCounter () { this->nEventsPosted++; } diff --git a/src/cas/generic/casdef.h b/src/cas/generic/casdef.h index 8873ded5c..634df9260 100644 --- a/src/cas/generic/casdef.h +++ b/src/cas/generic/casdef.h @@ -264,8 +264,10 @@ public: // subscriptionEventsProcessed() // - number of events removed by server library from the event queue // - epicsShareFunc unsigned subscriptionEventsPosted (void) const; - epicsShareFunc unsigned subscriptionEventsProcessed (void) const; + epicsShareFunc unsigned subscriptionEventsPosted () const; + epicsShareFunc unsigned subscriptionEventsProcessed () const; + + epicsShareFunc void generateBeaconAnomaly () const; epicsShareFunc class epicsTimer & createTimer (); diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h index cdbab8f91..40f99c3c1 100644 --- a/src/cas/generic/server.h +++ b/src/cas/generic/server.h @@ -909,11 +909,11 @@ public: casEventMask logEventMask() const; // DBE_LOG registerEvent("log") casEventMask alarmEventMask() const; // DBE_ALARM registerEvent("alarm") - unsigned subscriptionEventsProcessed (void) const; - void incrEventsProcessedCounter (void); + unsigned subscriptionEventsProcessed () const; + void incrEventsProcessedCounter (); - unsigned subscriptionEventsPosted (void) const; - void incrEventsPostedCounter (void); + unsigned subscriptionEventsPosted () const; + void incrEventsPostedCounter (); void lock () const; void unlock () const;