Changeset 10821 for code/branches/cpp11_v2/src/libraries/network

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

Location:

code/branches/cpp11_v2/src/libraries/network

Files:

• FunctionCall.cc (modified) (1 diff)
• Host.cc (modified) (3 diffs)
• synchronisable/Synchronisable.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/network/FunctionCall.cc

@@ -131 +131 @@
   *(uint32_t*)(mem+2*sizeof(uint32_t)) = this->objectID_;
   mem += 3*sizeof(uint32_t);
-  for( std::vector<MultiType>::iterator it = this->arguments_.begin(); it!=this->arguments_.end(); ++it )
+  for(auto & elem : this->arguments_)
   {
-    it->exportData( mem );
+    elem.exportData( mem );
   }
 }

code/branches/cpp11_v2/src/libraries/network/Host.cc

@@ -80 +80 @@
   void Host::addPacket(ENetPacket *packet, int clientID, uint8_t channelID)
   {
-    for( std::vector<Host*>::iterator it = instances_s.begin(); it!=instances_s.end(); ++it )
+    for(auto & instances_ : instances_s)
     {
-      if( (*it)->isActive() )
+      if( (instances_)->isActive() )
       {
-        (*it)->queuePacket(packet, clientID, channelID);
+        (instances_)->queuePacket(packet, clientID, channelID);
       }
     }
@@ -97 +97 @@
   void Host::sendChat(const std::string& message, unsigned int sourceID, unsigned int targetID)
   {
-    for( std::vector<Host*>::iterator it = instances_s.begin(); it!=instances_s.end(); ++it )
-      if( (*it)->isActive() )
-        (*it)->doSendChat(message, sourceID, targetID);
+    for(auto & instances_ : instances_s)
+      if( (instances_)->isActive() )
+        (instances_)->doSendChat(message, sourceID, targetID);
   }
 
@@ -114 +114 @@
   bool Host::isServer()
   {
-    for (std::vector<Host*>::iterator it=instances_s.begin(); it!=instances_s.end(); ++it )
+    for (auto & instances_ : instances_s)
     {
-      if( (*it)->isActive() )
+      if( (instances_)->isActive() )
       {
-        if( (*it)->isServer_() )
+        if( (instances_)->isServer_() )
           return true;
       }

code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc

@@ -88 +88 @@
     }
     // delete all Synchronisable Variables from syncList_ ( which are also in stringList_ )
-    for(std::vector<SynchronisableVariableBase*>::iterator it = syncList_.begin(); it!=syncList_.end(); it++)
-      delete (*it);
+    for(auto & elem : syncList_)
+      delete (elem);
     syncList_.clear();
     stringList_.clear();