Changeset 11054 for code/branches/cpp11_v3/src/orxonox/controllers/MasterController.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/MasterController.cc (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/controllers/MasterController.cc

@@ -58 +58 @@
         {
             //fill the vector in the first tick
-            for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>::begin(); it; ++it)
+            for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>().begin(); it; ++it)
             {
                 //----0ptr?----