[Orxonox-commit 1816] r6534 - code/trunk/src/orxonox/interfaces

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-03-16 10:59:43 +0100 (Tue, 16 Mar 2010)
New Revision: 6534

Modified:
   code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc
Log:
PickupCarrier destructor a little more compact.


Modified: code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc	2010-03-16 09:49:35 UTC (rev 6533)
+++ code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc	2010-03-16 09:59:43 UTC (rev 6534)
@@ -63,11 +63,10 @@
     
     PickupCarrier::~PickupCarrier()
     {
-        while(this->pickups_.size() > 0)
+        std::set<Pickupable*>::iterator it = this->pickups_.begin();
+        while(it != this->pickups_.end())
         {
-            std::set<Pickupable*>::iterator it = this->pickups_.begin();
-            this->pickups_.erase(it);
-            (*it)->destroy();
+            (*(it++))->destroy();
         }
 
         this->pickups_.clear();