Changeset 10769 for code/branches/cpp11_v2/src/modules/objects

Timestamp:

Nov 7, 2015, 10:23:42 AM (9 years ago)

Author:

landauf

Message:

no space needed anymore between closing template brackets ('> >' → '>>')

Location:

code/branches/cpp11_v2/src/modules/objects

Files:

• SpaceBoundaries.cc (modified) (1 diff)
• SpaceBoundaries.h (modified) (1 diff)
• triggers/DistanceMultiTrigger.cc (modified) (2 diffs)
• triggers/DistanceMultiTrigger.h (modified) (1 diff)
• triggers/MultiTrigger.h (modified) (1 diff)
• triggers/Trigger.h (modified) (1 diff)

code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc

@@ -208 +208 @@
         float distance;
         bool humanItem;
-        for( std::list<WeakPtr<Pawn> >::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
+        for( std::list<WeakPtr<Pawn>>::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
         {
             Pawn* currentPawn = *current;

code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h

@@ -101 +101 @@
 
             // Variabeln::
-            std::list<WeakPtr<Pawn> > pawnsIn_; //!< List of the pawns that this instance of SpaceBoundaries has to handle.
+            std::list<WeakPtr<Pawn>> pawnsIn_; //!< List of the pawns that this instance of SpaceBoundaries has to handle.
 
             std::vector<BillboardAdministration> billboards_;

code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -100 +100 @@
 
         // Check for objects that were in range but no longer are. Iterate through all objects, that are in range.
-        for(std::set<WeakPtr<WorldEntity> >::iterator it = this->range_.begin(); it != this->range_.end(); )
+        for(std::set<WeakPtr<WorldEntity>>::iterator it = this->range_.begin(); it != this->range_.end(); )
         {
             WorldEntity* entity = *it;
@@ -261 +261 @@
     bool DistanceMultiTrigger::addToRange(WorldEntity* entity)
     {
-        std::pair<std::set<WeakPtr<WorldEntity> >::iterator, bool> pair = this->range_.insert(entity);
+        std::pair<std::set<WeakPtr<WorldEntity>>::iterator, bool> pair = this->range_.insert(entity);
         return pair.second;
     }

code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.h

@@ -153 +153 @@
             ClassTreeMask beaconMask_; //!< A mask, that only accepts DistanceTriggerBeacons.
 
-            std::set<WeakPtr<WorldEntity> > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
+            std::set<WeakPtr<WorldEntity>> range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
 
     };

code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h

@@ -192 +192 @@
             std::set<BaseObject*> triggered_; //!< The set of all objects the MultiTrigger is triggered for.
 
-            std::deque< std::pair<float, MultiTriggerState*> > stateQueue_; //!< The queue of states waiting to become active.
+            std::deque<std::pair<float, MultiTriggerState*>> stateQueue_; //!< The queue of states waiting to become active.
 
             ClassTreeMask targetMask_; //!< The target mask, masking all objects that can trigger this MultiTrigger.

code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.h

@@ -127 +127 @@
             BillboardSet debugBillboard_; //!< A set of debug billboards to visualize the state of the trigger.
 
-            std::queue<std::pair<float, char> > stateChanges_; //!< A queue of state changes (in the same format as latestState_) paired with the time they will take effect since the last state change took effect.
+            std::queue<std::pair<float, char>> stateChanges_; //!< A queue of state changes (in the same format as latestState_) paired with the time they will take effect since the last state change took effect.
     };