[Opentnl-cvs] tnl/tnl ghostConnection.cpp,1.3,1.4 tnlTypes.h,1.2,1.3
Brought to you by:
mark_frohnmayer,
s_alanet
From: Mark F. <mar...@us...> - 2004-05-04 06:27:52
|
Update of /cvsroot/opentnl/tnl/tnl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8692/tnl Modified Files: ghostConnection.cpp tnlTypes.h Log Message: fixed <new> conflict with STL (I think) fixed server deleted object crash fixed ghosting bug where objects not yet available got messages Index: tnlTypes.h =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/tnlTypes.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tnlTypes.h 30 Apr 2004 20:27:40 -0000 1.2 --- tnlTypes.h 4 May 2004 06:27:40 -0000 1.3 *************** *** 37,42 **** #endif #include <stdlib.h> ! inline void* operator new(size_t size, void* ptr) { return ptr; } ! namespace TNL { --- 37,42 ---- #endif #include <stdlib.h> ! //inline void* operator new(size_t size, void* ptr) { return ptr; } ! #include <new> namespace TNL { Index: ghostConnection.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/ghostConnection.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ghostConnection.cpp 2 May 2004 06:27:40 -0000 1.3 --- ghostConnection.cpp 4 May 2004 06:27:39 -0000 1.4 *************** *** 867,871 **** ghostPushToZero(mGhostArray[j]); mGhostArray[j]->flags &= ~GhostInfo::NotYetGhosted; ! mGhostArray[j]->flags |= GhostInfo::ScopedEvent; postNetEvent(new GhostAlwaysObjectEvent(mGhostArray[j]->obj, mGhostArray[j]->index)); --- 867,871 ---- ghostPushToZero(mGhostArray[j]); mGhostArray[j]->flags &= ~GhostInfo::NotYetGhosted; ! mGhostArray[j]->flags |= GhostInfo::Ghosting | GhostInfo::ScopedEvent; postNetEvent(new GhostAlwaysObjectEvent(mGhostArray[j]->obj, mGhostArray[j]->index)); |