Changeset 3040 for code/branches

Timestamp:

May 24, 2009, 9:43:45 PM (16 years ago)

Author:

landauf

Message:

added 2 typedefs in PickupCollection.cc to replace _Pairii which isn't supported by gcc.

Location:

code/branches/pickups2/src/orxonox/objects/pickup

Files:

• PickupCollection.cc (modified) (9 diffs)
• PickupInventory.cc (modified) (1 prop)
• PickupInventory.h (modified) (1 prop)

code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc

@@ -45 +45 @@
 namespace orxonox
 {
+    typedef std::pair<std::multimap<std::string, BaseItem*>::iterator, std::multimap<std::string, BaseItem*>::iterator> item_range;
+    typedef std::pair<std::multimap<ModifierType::Enum, float>::iterator, std::multimap<ModifierType::Enum, float>::iterator> modifier_range;
+
     //! Constructor
     PickupCollection::PickupCollection()
@@ -55 +58 @@
         @brief
             Add an item to the collection.
-            
+
             Only adds the item if there's a free slot for it.
 
@@ -122 +125 @@
         else
         {
-            std::multimap<std::string, BaseItem*>::_Pairii bounds = this->items_.equal_range(item->getPickupIdentifier());
+            item_range bounds = this->items_.equal_range(item->getPickupIdentifier());
             for (std::multimap<std::string, BaseItem*>::iterator it = bounds.first; it != bounds.second && it != this->items_.end(); it++)
             {
@@ -174 +177 @@
         else
         {
-            std::multimap<std::string, BaseItem*>::_Pairii bounds = this->items_.equal_range(item->getPickupIdentifier());
+            item_range bounds = this->items_.equal_range(item->getPickupIdentifier());
             for (std::multimap<std::string, BaseItem*>::iterator it = bounds.first; it != bounds.second && it != this->items_.end(); it++)
             {
@@ -193 +196 @@
             else
                 this->currentUsable_ = NULL;
-            
+
         }
     }
@@ -214 +217 @@
         float v = 0.0f;
 
-        std::multimap<ModifierType::Enum, float>::_Pairii range = this->additiveModifiers_.equal_range(type);
+        modifier_range range = this->additiveModifiers_.equal_range(type);
 
         for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->additiveModifiers_.end(); it++)
@@ -230 +233 @@
     void PickupCollection::removeAdditiveModifier(ModifierType::Enum type, float value)
     {
-        std::multimap<ModifierType::Enum, float>::_Pairii range = this->additiveModifiers_.equal_range(type);
+        modifier_range range = this->additiveModifiers_.equal_range(type);
         for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->additiveModifiers_.end(); it++)
         {
@@ -258 +261 @@
         float v = 1.0f;
 
-        std::multimap<ModifierType::Enum, float>::_Pairii range = this->multiplicativeModifiers_.equal_range(type);
+        modifier_range range = this->multiplicativeModifiers_.equal_range(type);
         for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->multiplicativeModifiers_.end(); it++)
         {
@@ -273 +276 @@
     void PickupCollection::removeMultiplicativeModifier(ModifierType::Enum type, float value)
     {
-        std::multimap<ModifierType::Enum, float>::_Pairii range = this->multiplicativeModifiers_.equal_range(type);
+        modifier_range range = this->multiplicativeModifiers_.equal_range(type);
         for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->multiplicativeModifiers_.end(); it++)
         {