Changeset 10769 for code/branches/cpp11_v2/src/libraries/network
- Timestamp:
- Nov 7, 2015, 10:23:42 AM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/libraries/network
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc
r10624 r10769 37 37 38 38 std::map<uint32_t, packet::FunctionCalls*> FunctionCallManager::sPeerMap_; 39 std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t> >> FunctionCallManager::sIncomingFunctionCallBuffer_;39 std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t>>> FunctionCallManager::sIncomingFunctionCallBuffer_; 40 40 41 41 … … 70 70 void FunctionCallManager::processBufferedFunctionCalls() 71 71 { 72 std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t> >>::iterator it = FunctionCallManager::sIncomingFunctionCallBuffer_.begin();72 std::vector<std::pair<FunctionCall, std::pair<uint32_t, uint32_t>>>::iterator it = FunctionCallManager::sIncomingFunctionCallBuffer_.begin(); 73 73 while( it!=FunctionCallManager::sIncomingFunctionCallBuffer_.end() ) 74 74 { -
code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.h
r10624 r10769 54 54 55 55 static std::map<uint32_t, packet::FunctionCalls*> sPeerMap_; 56 static std::vector<std::pair<FunctionCall,std::pair<uint32_t, uint32_t> >> sIncomingFunctionCallBuffer_;56 static std::vector<std::pair<FunctionCall,std::pair<uint32_t, uint32_t>>> sIncomingFunctionCallBuffer_; 57 57 protected: 58 58 FunctionCallManager(); -
code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc
r10768 r10769 351 351 // void GamestateManager::removeClient(ClientInformation* client){ 352 352 // assert(client); 353 // std::map<unsigned int, std::map<unsigned int, packet::Gamestate*> 353 // std::map<unsigned int, std::map<unsigned int, packet::Gamestate*>>::iterator clientMap = gamestateMap_.find(client->getID()); 354 354 // // first delete all remained gamestates 355 355 // std::map<unsigned int, packet::Gamestate*>::iterator it; -
code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
r10622 r10769 108 108 bool processGamestate(packet::Gamestate *gs); 109 109 110 // std::map<unsigned int, std::map<unsigned int, packet::Gamestate*> 110 // std::map<unsigned int, std::map<unsigned int, packet::Gamestate*>> gamestateMap_; 111 111 std::map<unsigned int, packet::Gamestate*> gamestateQueue; 112 112 // std::map<unsigned int, uint32_t> lastProcessedGamestateID_; -
code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc
r10768 r10769 148 148 // shortcut for maps 149 149 std::map<unsigned int, objInfo >& objectListPerm = clientListPerm_[clientID]; 150 std::map<unsigned int, std::list<obj> 150 std::map<unsigned int, std::list<obj>>& objectListTemp = clientListTemp_[clientID]; 151 151 152 152 for(itvec = objectListTemp[gamestateID].begin(); itvec != objectListTemp[gamestateID].end(); itvec++) … … 180 180 void TrafficControl::insertinClientListPerm(unsigned int clientID, obj objinf) 181 181 { 182 std::map<unsigned int,std::map<unsigned int, objInfo> 182 std::map<unsigned int,std::map<unsigned int, objInfo>>::iterator itperm;//iterator clientListPerm over clientIDs 183 183 unsigned int gsid=GAMESTATEID_INITIAL, gsdiff=currentGamestateID, prioperm=Synchronisable::getSynchronisable(objinf.objID)->getPriority(), priomom=0; 184 184 clientListPerm_[clientID][objinf.objID] = objInfo(objinf.objID, objinf.objCreatorID,gsid,gsdiff, objinf.objSize,prioperm,priomom); -
code/branches/cpp11_v2/src/libraries/network/TrafficControl.h
r6746 r10769 82 82 *permanent client list: contains client ids, object ids and objectInfos (in this order) 83 83 */ 84 std::map<unsigned int, std::map<unsigned int, objInfo > 84 std::map<unsigned int, std::map<unsigned int, objInfo >> clientListPerm_; 85 85 //has to be created with constructor and then needs to be updated by evaluateList(). 86 86 … … 88 88 *temporary client list: contains client ids, gamestate ids and object ids (in this order) 89 89 */ 90 std::map<unsigned int, std::map<unsigned int, std::list<obj> >> clientListTemp_;90 std::map<unsigned int, std::map<unsigned int, std::list<obj>>> clientListTemp_; 91 91 92 92 /**updateReferenceList -
code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc
r10765 r10769 52 52 uint32_t network_id; 53 53 flags_ = flags_ | PACKET_FLAGS_CLASSID; 54 std::queue<std::pair<uint32_t, std::string> 54 std::queue<std::pair<uint32_t, std::string>> tempQueue; 55 55 56 56 //calculate total needed size (for all strings and integers) -
code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.cc
r10624 r10769 53 53 uint32_t networkID; 54 54 flags_ = flags_ | PACKET_FLAGS_FUNCTIONIDS; 55 std::queue<std::pair<uint32_t, std::string> 55 std::queue<std::pair<uint32_t, std::string>> tempQueue; 56 56 57 57 //calculate total needed size (for all strings and integers) -
code/branches/cpp11_v2/src/libraries/network/synchronisable/Serialise.h
r10624 r10769 90 90 { 91 91 // *const_cast<typename Loki::TypeTraits<T*>::UnqualifiedType*>(&variable) = dynamic_cast<T*>(variable->getSynchronisable( *(uint32_t*)(mem) )); 92 *const_cast<typename Loki::TypeTraits<StrongPtr<T> 92 *const_cast<typename Loki::TypeTraits<StrongPtr<T>>::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem))); 93 93 mem += returnSize( variable ); 94 94 } … … 125 125 { 126 126 // *const_cast<typename Loki::TypeTraits<T*>::UnqualifiedType*>(&variable) = dynamic_cast<T*>(variable->getSynchronisable( *(uint32_t*)(mem) )); 127 *const_cast<typename Loki::TypeTraits<WeakPtr<T> 127 *const_cast<typename Loki::TypeTraits<WeakPtr<T>>::UnqualifiedType*>(&variable) = orxonox_cast<T*>(T::getSynchronisable(*(uint32_t*)(mem))); 128 128 mem += returnSize( variable ); 129 129 } -
code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h
r10768 r10769 242 242 SynchronisableVariableBase* sv; 243 243 if (bidirectional) 244 sv = new SynchronisableVariableBidirectional<std::set<T> 244 sv = new SynchronisableVariableBidirectional<std::set<T>>(variable, mode, cb); 245 245 else 246 sv = new SynchronisableVariable<std::set<T> 246 sv = new SynchronisableVariable<std::set<T>>(variable, mode, cb); 247 247 syncList_.push_back(sv); 248 248 stringList_.push_back(sv); … … 250 250 251 251 template <> _NetworkExport void Synchronisable::registerVariable( std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional); 252 // template <class T> _NetworkExport void Synchronisable::registerVariable<std::set<T> 252 // template <class T> _NetworkExport void Synchronisable::registerVariable<std::set<T>>( std::set<T>& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional); 253 253 template <> _NetworkExport void Synchronisable::unregisterVariable( std::string& variable ); 254 254
Note: See TracChangeset
for help on using the changeset viewer.