Changeset 2823 for code/branches/netp/src/network
- Timestamp:
- Mar 23, 2009, 11:12:14 AM (16 years ago)
- Location:
- code/branches/netp/src/network/synchronisable
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/netp/src/network/synchronisable/Synchronisable.cc
r2822 r2823 98 98 // delete callback function objects 99 99 if(!Identifier::isCreatingHierarchy()){ 100 for(std:: list<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)100 for(std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++) 101 101 delete (*it); 102 102 if (this->objectMode_ != 0x0 && (Host::running() && Host::isServer())) … … 252 252 253 253 assert(this->classID==this->getIdentifier()->getNetworkID()); 254 std:: list<SynchronisableVariableBase*>::iterator i;254 std::vector<SynchronisableVariableBase*>::iterator i; 255 255 256 256 // start copy header … … 292 292 if(mode==0x0) 293 293 mode=state_; 294 std:: list<SynchronisableVariableBase *>::iterator i;294 std::vector<SynchronisableVariableBase *>::iterator i; 295 295 if(syncList.empty()){ 296 296 assert(0); … … 337 337 assert( mode==state_ ); 338 338 tsize += this->dataSize_; 339 std:: list<SynchronisableVariableBase*>::iterator i;339 std::vector<SynchronisableVariableBase*>::iterator i; 340 340 for(i=stringList.begin(); i!=stringList.end(); ++i){ 341 341 tsize += (*i)->getSize( mode ); -
code/branches/netp/src/network/synchronisable/Synchronisable.h
r2822 r2823 33 33 34 34 #include <list> 35 #include <vector> 35 36 #include <map> 36 37 #include <queue> … … 156 157 uint32_t classID; 157 158 158 std:: list<SynchronisableVariableBase*> syncList;159 std:: list<SynchronisableVariableBase*> stringList;159 std::vector<SynchronisableVariableBase*> syncList; 160 std::vector<SynchronisableVariableBase*> stringList; 160 161 uint32_t dataSize_; //size of all variables except strings 161 162 static uint8_t state_; // detemines wheter we are server (default) or client … … 196 197 197 198 // template <class T> void Synchronisable::unregisterVariable(T& var){ 198 // std:: list<SynchronisableVariableBase*>::iterator it = syncList.begin();199 // std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); 199 200 // while(it!=syncList.end()){ 200 201 // if( ((*it)->getReference()) == &var ){
Note: See TracChangeset
for help on using the changeset viewer.