diff --git a/src/cas/generic/casInternal.h b/src/cas/generic/casInternal.h index 63884c172..dd2b10bbd 100644 --- a/src/cas/generic/casInternal.h +++ b/src/cas/generic/casInternal.h @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.18.2.1 2000/07/06 15:21:34 jhill + * added DLL export to destructor + * * Revision 1.18 1998/11/18 18:52:49 jhill * fixed casChannelI undefined symbols on WIN32 * @@ -104,7 +107,7 @@ class casChannelI; // class casEvent : public tsDLNode { public: - virtual ~casEvent(); + epicsShareFunc virtual ~casEvent(); virtual caStatus cbFunc(casEventSys &)=0; private: }; @@ -123,7 +126,7 @@ enum casResType {casChanT=1, casClientMonT, casPVT}; class casRes : public uintRes { public: - virtual ~casRes(); + epicsShareFunc virtual ~casRes(); virtual casResType resourceType() const = 0; virtual void show (unsigned level) const = 0; virtual void destroy() = 0; @@ -152,7 +155,7 @@ private: class ioBlockedList : private tsDLList { public: ioBlockedList (); - virtual ~ioBlockedList (); + epicsShareFunc virtual ~ioBlockedList (); void signal (); void removeItemFromIOBLockedList(ioBlocked &item); void addItemToIOBLockedList(ioBlocked &item); @@ -286,7 +289,7 @@ class casAsyncPVCreateIO; class casAsyncIOI : public casEvent, public tsDLNode { public: casAsyncIOI (casCoreClient &client, casAsyncIO &ioExternal); - virtual ~casAsyncIOI(); + epicsShareFunc virtual ~casAsyncIOI(); // // place notification of IO completion on the event queue @@ -334,7 +337,7 @@ private: class casAsyncRdIOI : public casAsyncIOI { public: epicsShareFunc casAsyncRdIOI(const casCtx &ctx, casAsyncReadIO &ioIn); - virtual ~casAsyncRdIOI(); + epicsShareFunc virtual ~casAsyncRdIOI(); void destroyIfReadOP(); @@ -359,7 +362,7 @@ private: class casAsyncWtIOI : public casAsyncIOI { public: epicsShareFunc casAsyncWtIOI(const casCtx &ctx, casAsyncWriteIO &ioIn); - virtual ~casAsyncWtIOI(); + epicsShareFunc virtual ~casAsyncWtIOI(); // // place notification of IO completion on the event queue @@ -384,7 +387,7 @@ class casDGIntfIO; class casAsyncExIOI : public casAsyncIOI { public: epicsShareFunc casAsyncExIOI(const casCtx &ctx, casAsyncPVExistIO &ioIn); - virtual ~casAsyncExIOI(); + epicsShareFunc virtual ~casAsyncExIOI(); // // place notification of IO completion on the event queue @@ -408,7 +411,7 @@ private: class casAsyncPVCIOI : public casAsyncIOI { public: epicsShareFunc casAsyncPVCIOI(const casCtx &ctx, casAsyncPVCreateIO &ioIn); - virtual ~casAsyncPVCIOI(); + epicsShareFunc virtual ~casAsyncPVCIOI(); // // place notification of IO completion on the event queue @@ -517,7 +520,7 @@ class casPVListChan : public casChannelI, public tsDLNode { public: casPVListChan (const casCtx &ctx, casChannel &chanAdapter); - virtual ~casPVListChan(); + epicsShareFunc virtual ~casPVListChan(); }; class caServerI; @@ -535,7 +538,7 @@ class casPVI : { public: casPVI (casPV &pvAdapter); - virtual ~casPVI(); + epicsShareFunc virtual ~casPVI(); // // for use by the server library diff --git a/src/cas/generic/st/ioBlocked.cc b/src/cas/generic/st/ioBlocked.cc index d47351dc5..3180116d3 100644 --- a/src/cas/generic/st/ioBlocked.cc +++ b/src/cas/generic/st/ioBlocked.cc @@ -7,6 +7,9 @@ // (for single threaded version of the server) // // $Log$ +// Revision 1.4 1998/02/05 23:03:39 jhill +// hp comiler workaround changes +// // Revision 1.3 1997/06/13 09:16:10 jhill // connect proto changes // @@ -20,8 +23,7 @@ #include -#include "casdef.h" -#include "osiMutexNOOP.h" +#include "server.h" //