diff --git a/src/ca/cacIO.h b/src/ca/cacIO.h index 675e5c100..6b8326e8b 100644 --- a/src/ca/cacIO.h +++ b/src/ca/cacIO.h @@ -33,15 +33,12 @@ public: virtual void exceptionNotify ( int status, const char *pContext, unsigned type, unsigned long count ); private: cacNotifyIO *pIO; - virtual void lock (); - virtual void unlock (); - static osiMutex defaultMutex; friend class cacNotifyIO; }; class epicsShareClass cacNotifyIO { public: - cacNotifyIO ( cacNotify &); + cacNotifyIO ( cacNotify & ); virtual ~cacNotifyIO () = 0; virtual void destroy () = 0; void completionNotify (); @@ -98,7 +95,6 @@ private: virtual void exceptionNotify ( int status, const char *pContext ); virtual void connectTimeoutNotify (); - friend class cacChannelIO; }; diff --git a/src/ca/cacNotify.cpp b/src/ca/cacNotify.cpp index a89e76421..51c8afda8 100644 --- a/src/ca/cacNotify.cpp +++ b/src/ca/cacNotify.cpp @@ -12,8 +12,6 @@ #include "iocinf.h" -osiMutex cacNotify::defaultMutex; - cacNotify::cacNotify () : pIO (0) { } @@ -27,16 +25,6 @@ cacNotify::~cacNotify () } } -void cacNotify::lock () -{ - this->defaultMutex.lock (); -} - -void cacNotify::unlock () -{ - this->defaultMutex.unlock (); -} - void cacNotify::completionNotify () { ca_printf ("CAC: IO completion with no handler installed?\n");