diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index c10679108..ea17d45db 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -1055,9 +1055,9 @@ void cac::recycleSubscription ( netSubscription &io ) } cacChannel::ioid -cac::subscriptionRequest ( nciu &chan, unsigned type, // X aCC 361 +cac::subscriptionRequest ( nciu & chan, unsigned type, // X aCC 361 arrayElementCount nElem, unsigned mask, - cacStateNotify ¬ifyIn ) + cacStateNotify & notifyIn ) { epicsGuard < cacMutex > guard ( this->mutex ); autoPtrRecycle < netSubscription > pIO ( this->ioTable, @@ -1070,9 +1070,9 @@ cac::subscriptionRequest ( nciu &chan, unsigned type, // X aCC 361 this->flushIfRequired ( guard, *chan.getPIIU() ); chan.getPIIU()->subscriptionRequest ( guard, chan, *pIO ); } - cacChannel::ioid id = pIO->getId (); + cacChannel::ioid idOut = pIO->getId (); pIO.release (); - return id; + return idOut; } bool cac::versionAction ( epicsGuard < callbackMutex > &, tcpiiu &,