[Opentnl-cvs] tnl/tnl tnlJournal.h,1.10,1.11 tnlMethodDispatch.h,1.10,1.11 tnlNetObject.h,1.11,1.12 tnlRPC.h,1.12,1.13 tnlThread.h,1.2,1.3

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/tnl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19006/tnl

Modified Files:
	tnlJournal.h tnlMethodDispatch.h tnlNetObject.h tnlRPC.h 
	tnlThread.h 
Log Message:
Updated for gcc compile of new template code

Index: tnlRPC.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/tnl/tnlRPC.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tnlRPC.h	21 Feb 2005 07:48:14 -0000	1.12
--- tnlRPC.h	22 Feb 2005 05:55:45 -0000	1.13
***************
*** 147,151 ****
  public: \
     TNL::FunctorDecl<void (className::*) args > mFunctorDecl;\
!    RPC_##className##_##name() : mFunctorDecl(className::name##_remote), TNL::RPCEvent(guaranteeType, eventDirection) { mFunctor = &mFunctorDecl; } \
     TNL_DECLARE_CLASS( RPC_##className##_##name ); \
     bool checkClassType(TNL::Object *theObject) { return dynamic_cast<className *>(theObject) != NULL; } }; \
--- 147,151 ----
  public: \
     TNL::FunctorDecl<void (className::*) args > mFunctorDecl;\
!    RPC_##className##_##name() : TNL::RPCEvent(guaranteeType, eventDirection), mFunctorDecl(&className::name##_remote) { mFunctor = &mFunctorDecl; } \
     TNL_DECLARE_CLASS( RPC_##className##_##name ); \
     bool checkClassType(TNL::Object *theObject) { return dynamic_cast<className *>(theObject) != NULL; } }; \

Index: tnlJournal.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/tnl/tnlJournal.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tnlJournal.h	21 Feb 2005 07:48:14 -0000	1.10
--- tnlJournal.h	22 Feb 2005 05:55:45 -0000	1.11
***************
*** 102,106 ****
        struct Journal_##className##_##func##_er : public JournalEntryRecord { \
        FunctorDecl<void (className::*) args> mFunctorDecl; \
!       Journal_##className##_##func##_er(const char *name) : JournalEntryRecord(name), mFunctorDecl(className::func##_body) { mFunctor = &mFunctorDecl; } \
        } gJournal_##className##_##func##_er(#func); \
        void className::func args { \
--- 102,106 ----
        struct Journal_##className##_##func##_er : public JournalEntryRecord { \
        FunctorDecl<void (className::*) args> mFunctorDecl; \
!       Journal_##className##_##func##_er(const char *name) : JournalEntryRecord(name), mFunctorDecl(&className::func##_body) { mFunctor = &mFunctorDecl; } \
        } gJournal_##className##_##func##_er(#func); \
        void className::func args { \

Index: tnlMethodDispatch.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/tnl/tnlMethodDispatch.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tnlMethodDispatch.h	21 Feb 2005 07:48:14 -0000	1.10
--- tnlMethodDispatch.h	22 Feb 2005 05:55:45 -0000	1.11
***************
*** 80,86 ****
     template <typename T> inline void read(TNL::BitStream &s, TNL::Vector<T> *val)
     {
!       U32 size = s.readInt(VectorSizeBitSize);
        val->setSize(size);
!       for(S32 i = 0; i < val->size(); i++)
           read(s, &((*val)[i]));
     }
--- 80,86 ----
     template <typename T> inline void read(TNL::BitStream &s, TNL::Vector<T> *val)
     {
!       TNL::U32 size = s.readInt(VectorSizeBitSize);
        val->setSize(size);
!       for(TNL::S32 i = 0; i < val->size(); i++)
           read(s, &((*val)[i]));
     }
***************
*** 88,92 ****
     {
        s.writeInt(val.size(), VectorSizeBitSize);
!       for(S32 i = 0; i < val.size(); i++)
           write(s, val[i]);
     }
--- 88,92 ----
     {
        s.writeInt(val.size(), VectorSizeBitSize);
!       for(TNL::S32 i = 0; i < val.size(); i++)
           write(s, val[i]);
     }

Index: tnlNetObject.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/tnl/tnlNetObject.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tnlNetObject.h	21 Feb 2005 07:48:14 -0000	1.11
--- tnlNetObject.h	22 Feb 2005 05:55:45 -0000	1.12
***************
*** 409,413 ****
  public: \
     TNL::FunctorDecl<void (className::*)args> mFunctorDecl;\
!    RPCEV_##className##_##name(TNL::NetObject *theObject = NULL) : mFunctorDecl(className::name##_remote), TNL::NetObjectRPCEvent(theObject, guaranteeType, eventDirection) { mFunctor = &mFunctorDecl; } \
     TNL_DECLARE_CLASS( RPCEV_##className##_##name ); \
     bool checkClassType(TNL::Object *theObject) { return dynamic_cast<className *>(theObject) != NULL; } }; \
--- 409,413 ----
  public: \
     TNL::FunctorDecl<void (className::*)args> mFunctorDecl;\
!    RPCEV_##className##_##name(TNL::NetObject *theObject = NULL) : TNL::NetObjectRPCEvent(theObject, guaranteeType, eventDirection), mFunctorDecl(&className::name##_remote) { mFunctor = &mFunctorDecl; } \
     TNL_DECLARE_CLASS( RPCEV_##className##_##name ); \
     bool checkClassType(TNL::Object *theObject) { return dynamic_cast<className *>(theObject) != NULL; } }; \

Index: tnlThread.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/tnl/tnlThread.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tnlThread.h	21 Feb 2005 07:48:14 -0000	1.2
--- tnlThread.h	22 Feb 2005 05:55:45 -0000	1.3
***************
*** 203,207 ****
  #define TNL_IMPLEMENT_THREADQ_METHOD(className, func, args, argNames) \
     void className::func args { \
!    FunctorDecl<void (className::*)args> *theCall = new FunctorDecl<void (className::*)args>(className::func##_body); \
     theCall->set argNames; \
     postCall(theCall); \
--- 203,207 ----
  #define TNL_IMPLEMENT_THREADQ_METHOD(className, func, args, argNames) \
     void className::func args { \
!    FunctorDecl<void (className::*)args> *theCall = new FunctorDecl<void (className::*)args>(&className::func##_body); \
     theCall->set argNames; \
     postCall(theCall); \