Changeset 11065 for code/branches/cpp11_v3/src/orxonox/controllers/MasterController.h

Timestamp:

Jan 17, 2016, 1:59:00 PM (8 years ago)

Author:

landauf

Message:

added c++11 features to code that was added in presentationHS15

File:

• code/branches/cpp11_v3/src/orxonox/controllers/MasterController.h (modified) (2 diffs)

code/branches/cpp11_v3/src/orxonox/controllers/MasterController.h

@@ -61 +61 @@
 
             //----[orxonox demanded functions]----
-                virtual void tick(float dt); 
+                virtual void tick(float dt) override;
 
             //----[orxonox demanded functions]----
@@ -68 +68 @@
           
         private:
-            std::vector<WeakPtr<ActionpointController> > controllers_;  //<! vector of controllers, which action(), canFire() and maneuver() methods are to be called
+            std::vector<WeakPtr<ActionpointController>> controllers_;//<! vector of controllers, which action(), canFire() and maneuver() methods are to be called
             size_t indexOfCurrentController_;                        //<! index of current controller
             unsigned int numberOfTicksPassedSinceLastActionCall_;