diff --git a/src/ca/oldChannelNotify.cpp b/src/ca/oldChannelNotify.cpp index f8e446d07..8edaf25b8 100644 --- a/src/ca/oldChannelNotify.cpp +++ b/src/ca/oldChannelNotify.cpp @@ -14,6 +14,10 @@ * 505 665 1831 */ +#ifdef _MSC_VER +# pragma warning(disable:4355) +#endif + #define epicsAssertAuthor "Jeff Hill johill@lanl.gov" #define epicsExportSharedSymbols @@ -21,18 +25,6 @@ #include "oldAccess.h" #include "cac.h" -#ifdef _MSC_VER -# pragma warning ( push ) -# pragma warning ( disable:4660 ) -#endif - -template class tsFreeList < oldChannelNotify, 1024 >; -template class epicsSingleton < tsFreeList < oldChannelNotify, 1024 > >; - -#ifdef _MSC_VER -# pragma warning ( pop ) -#endif - epicsSingleton < tsFreeList < struct oldChannelNotify, 1024 > > oldChannelNotify::pFreeList; extern "C" void cacNoopConnHandler ( struct connection_handler_args ) @@ -45,9 +37,10 @@ extern "C" void cacNoopAccesRightsHandler ( struct access_rights_handler_args ) oldChannelNotify::oldChannelNotify ( oldCAC & cacIn, const char *pName, caCh * pConnCallBackIn, void * pPrivateIn, capri priority ) : - io ( cacIn.createChannel ( pName, *this, priority ) ), cacCtx ( cacIn ), + cacCtx ( cacIn ), pConnCallBack ( pConnCallBackIn ? pConnCallBackIn : cacNoopConnHandler ), - pPrivate ( pPrivateIn ), pAccessRightsFunc ( cacNoopAccesRightsHandler ) + pPrivate ( pPrivateIn ), pAccessRightsFunc ( cacNoopAccesRightsHandler ), + io ( cacIn.createChannel ( pName, *this, priority ) ) { } diff --git a/src/ca/oldSubscription.cpp b/src/ca/oldSubscription.cpp index 0b41b3984..8e8a9e0c0 100644 --- a/src/ca/oldSubscription.cpp +++ b/src/ca/oldSubscription.cpp @@ -14,18 +14,6 @@ #include "iocinf.h" #include "oldAccess.h" -#ifdef _MSC_VER -# pragma warning ( push ) -# pragma warning ( disable:4660 ) -#endif - -template class tsFreeList < oldSubscription, 1024 >; -template class epicsSingleton < tsFreeList < oldSubscription, 1024 > >; - -#ifdef _MSC_VER -# pragma warning ( pop ) -#endif - epicsSingleton < tsFreeList < struct oldSubscription, 1024 > > oldSubscription::pFreeList; oldSubscription::~oldSubscription () diff --git a/src/ca/putCallback.cpp b/src/ca/putCallback.cpp index bdb8579c0..77b009a56 100644 --- a/src/ca/putCallback.cpp +++ b/src/ca/putCallback.cpp @@ -19,18 +19,6 @@ #include "iocinf.h" #include "oldAccess.h" -#ifdef _MSC_VER -# pragma warning ( push ) -# pragma warning ( disable:4660 ) -#endif - -template class tsFreeList < class putCallback, 1024 >; -template class epicsSingleton < tsFreeList < class putCallback, 1024 > >; - -#ifdef _MSC_VER -# pragma warning ( pop ) -#endif - epicsSingleton < tsFreeList < class putCallback, 1024 > > putCallback::pFreeList; putCallback::putCallback ( oldChannelNotify &chanIn,