Changeset 11054 for code/branches/cpp11_v3/src/modules/docking/DockingController.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/modules/docking/DockingController.h (modified) (2 diffs)

code/branches/cpp11_v3/src/modules/docking/DockingController.h

@@ -45 +45 @@
             virtual ~DockingController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             void takeControl(bool docking);
@@ -53 +53 @@
 
         protected:
-            virtual void positionReached();
+            virtual void positionReached() override;
 
         private: