From 8338c1bb3eb0ea950bf2673ea8a992f01761811c Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 22 Aug 2002 16:05:22 +0000 Subject: [PATCH] fixed sun pro warnings --- src/ca/cac.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 &,