[Orxonox-commit 4931] r9600 - in code/branches/core6/src: modules/objects orxonox

[landauf at orxonox.net]

Author: landauf
Date: 2013-03-29 16:34:31 +0100 (Fri, 29 Mar 2013)
New Revision: 9600

Modified:
   code/branches/core6/src/modules/objects/SpaceBoundaries.cc
   code/branches/core6/src/orxonox/Radar.h
Log:
details

Modified: code/branches/core6/src/modules/objects/SpaceBoundaries.cc
===================================================================
--- code/branches/core6/src/modules/objects/SpaceBoundaries.cc	2013-03-29 13:33:04 UTC (rev 9599)
+++ code/branches/core6/src/modules/objects/SpaceBoundaries.cc	2013-03-29 15:34:31 UTC (rev 9600)
@@ -72,7 +72,7 @@
     void SpaceBoundaries::checkWhoIsIn()
     {
         pawnsIn_.clear();
-        for(ObjectListIterator<Pawn> current = ObjectList<Pawn>::begin(); current != ObjectList<Pawn>::end(); ++current)
+        for(ObjectList<Pawn>::iterator current = ObjectList<Pawn>::begin(); current != ObjectList<Pawn>::end(); ++current)
         {
             Pawn* currentPawn = *current;
             if( this->reaction_ == 0 )

Modified: code/branches/core6/src/orxonox/Radar.h
===================================================================
--- code/branches/core6/src/orxonox/Radar.h	2013-03-29 13:33:04 UTC (rev 9599)
+++ code/branches/core6/src/orxonox/Radar.h	2013-03-29 15:34:31 UTC (rev 9600)
@@ -73,7 +73,7 @@
         void removeRadarObject(RadarViewable* rv);
         void radarObjectChanged(RadarViewable* rv);
 
-        ObjectListIterator<RadarViewable> itFocus_;
+        ObjectList<RadarViewable>::iterator itFocus_;
         RadarViewable* focus_;
         std::map<std::string, RadarViewable::Shape> objectTypes_;
         std::set<RadarViewable*> radarObjects_;