- Timestamp:
- Jan 10, 2016, 1:54:11 PM (9 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/network/TrafficControl.cc
r9667 r11054 30 30 31 31 #include <cassert> 32 #include < boost/bind.hpp>32 #include <functional> 33 33 34 34 #include "core/CoreIncludes.h" … … 38 38 namespace orxonox { 39 39 40 static const unsigned int SCHED_PRIORITY_OFFSET = static_cast<unsigned int>(-1); 40 static constexpr unsigned int SCHED_PRIORITY_OFFSET = static_cast<unsigned int>(-1); 41 namespace arg = std::placeholders; 41 42 42 43 objInfo::objInfo(uint32_t ID, uint32_t creatorID, int32_t curGsID, int32_t diffGsID, uint32_t size, unsigned int prioperm, unsigned int priosched) … … 64 65 *Initializing protected members 65 66 */ 66 TrafficControl *TrafficControl::instance_= 0;67 TrafficControl *TrafficControl::instance_=nullptr; 67 68 68 69 /** … … 72 73 { 73 74 RegisterObject(TrafficControl); 74 assert(instance_== 0);75 assert(instance_==nullptr); 75 76 instance_=this; 76 77 this->setConfigValues(); … … 78 79 79 80 /** 80 * @brief Destructor: resets the instance pointer to 081 * @brief Destructor: resets the instance pointer to nullptr 81 82 */ 82 83 TrafficControl::~TrafficControl() 83 84 { 84 instance_= 0;85 instance_=nullptr; 85 86 } 86 87 … … 148 149 // shortcut for maps 149 150 std::map<unsigned int, objInfo >& objectListPerm = clientListPerm_[clientID]; 150 std::map<unsigned int, std::list<obj> 151 std::map<unsigned int, std::list<obj>>& objectListTemp = clientListTemp_[clientID]; 151 152 152 153 for(itvec = objectListTemp[gamestateID].begin(); itvec != objectListTemp[gamestateID].end(); itvec++) … … 180 181 void TrafficControl::insertinClientListPerm(unsigned int clientID, obj objinf) 181 182 { 182 std::map<unsigned int,std::map<unsigned int, objInfo> 183 std::map<unsigned int,std::map<unsigned int, objInfo>>::iterator itperm;//iterator clientListPerm over clientIDs 183 184 unsigned int gsid=GAMESTATEID_INITIAL, gsdiff=currentGamestateID, prioperm=Synchronisable::getSynchronisable(objinf.objID)->getPriority(), priomom=0; 184 185 clientListPerm_[clientID][objinf.objID] = objInfo(objinf.objID, objinf.objCreatorID,gsid,gsdiff, objinf.objSize,prioperm,priomom); … … 258 259 259 260 //sort copied list according to priorities 260 // use boostbind here because we need to pass a memberfunction to stl sort261 // sort( list.begin(), list.end(), boost::bind(&TrafficControl::prioritySort, this, clientID, _1,_2) );262 list.sort( boost::bind(&TrafficControl::prioritySort, this, clientID, _1,_2) );263 264 // list.sort( boost::bind(&TrafficControl::prioritySort, this, clientID, _1,_2) );261 // use std::bind here because we need to pass a memberfunction to stl sort 262 // sort( list.begin(), list.end(), std::bind(&TrafficControl::prioritySort, this, clientID, arg::_1, arg::_2) ); 263 list.sort( std::bind(&TrafficControl::prioritySort, this, clientID, arg::_1, arg::_2) ); 264 265 // list.sort(std::bind(&TrafficControl::prioritySort, this, clientID, arg::_1, arg::_2) ); 265 266 266 267 //now we check, that the creator of an object always exists on a client … … 275 276 cut(list, targetSize); 276 277 //now sort again after objDataOffset 277 // sort(list.begin(), list.end(), boost::bind(&TrafficControl::dataSort, this, _1,_2) );278 list.sort( boost::bind(&TrafficControl::dataSort, this, _1,_2) );278 // sort(list.begin(), list.end(), std::bind(&TrafficControl::dataSort, this, arg::_1, arg::_2) ); 279 list.sort( std::bind(&TrafficControl::dataSort, this, arg::_1, arg::_2) ); 279 280 280 281 //diese Funktion updateClientList muss noch gemacht werden
Note: See TracChangeset
for help on using the changeset viewer.