From: DaveG <da...@us...> - 2006-07-08 09:48:31
|
Update of /cvsroot/planeshift/planeshift/src/common/interface In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1037/src/common/interface Modified Files: subscriber.h Log Message: Converted iNetSubscriber and iCmdSubscriber from old SCF to inherit virtually from csRefCount. Converting to new SCF would be overkill, as all we really need is ref counting here. Index: subscriber.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/interface/subscriber.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** subscriber.h 18 Jan 2005 23:28:27 -0000 1.8 --- subscriber.h 8 Jul 2006 09:48:29 -0000 1.9 *************** *** 20,26 **** #define __SUBSCRIBER_H__ ! #include <csutil/scf.h> ! ! SCF_VERSION (iNetSubscriber, 0, 0, 1); class MsgEntry; --- 20,25 ---- #define __SUBSCRIBER_H__ ! #include <csutil/refcount.h> ! #include <csutil/ref.h> class MsgEntry; *************** *** 32,36 **** * for the msg types they want. */ ! struct iNetSubscriber : public iBase { /** --- 31,35 ---- * for the msg types they want. */ ! struct iNetSubscriber : public virtual csRefCount { /** *************** *** 38,46 **** */ virtual bool Verify(MsgEntry *msg,unsigned int flags,Client*& client) = 0; ! virtual void HandleMessage(MsgEntry* msg,Client *client) = 0; }; - SCF_VERSION (iCmdSubscriber, 0, 0, 1); - /** * This interface must be implemented by objects that want to receive command line strings --- 37,43 ---- */ virtual bool Verify(MsgEntry *msg,unsigned int flags,Client*& client) = 0; ! virtual void HandleMessage(MsgEntry* msg,Client *client) = 0; }; /** * This interface must be implemented by objects that want to receive command line strings *************** *** 48,52 **** * for the "/commands" they want. */ ! struct iCmdSubscriber : public iBase { /** --- 45,49 ---- * for the "/commands" they want. */ ! struct iCmdSubscriber : public virtual csRefCount { /** |