Changeset 10920 for code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc

Timestamp:

Dec 6, 2015, 2:51:14 PM (8 years ago)

Author:

landauf

Message:

no static functions anymore in ObjectList. you need to instantiate an ObjectList to use it.
this allows for prettier for-loop syntax when iterating over an ObjectList of a specific context: for (T* object : ObjectList<T>(context)) { … }

File:

• code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc

@@ -113 +113 @@
         }
 
-        for (ObjectList<Timer>::iterator it = ObjectList<Timer>::begin(); it; )
+        ObjectList<Timer> listTimer;
+        for (ObjectList<Timer>::iterator it = listTimer.begin(); it; )
         {
             Timer* object = *it;
@@ -129 +130 @@
         }
         float realdt = leveldt * TimeFactorListener::getTimeFactor();
-        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; )
+        ObjectList<Tickable> listTickable;
+        for (ObjectList<Tickable>::iterator it = listTickable.begin(); it; )
         {
             Tickable* object = *it;