Changeset 11071 for code/trunk/src/modules/overlays/debugging

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/debugging/DebugFPSText.h (modified) (1 diff)
• src/modules/overlays/debugging/DebugPositionText.cc (modified) (1 diff)
• src/modules/overlays/debugging/DebugPositionText.h (modified) (1 diff)
• src/modules/overlays/debugging/DebugRTRText.h (modified) (1 diff)

code/trunk/src/modules/overlays/debugging/DebugFPSText.h

@@ -43 +43 @@
         virtual ~DebugFPSText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }

code/trunk/src/modules/overlays/debugging/DebugPositionText.cc

@@ -52 +52 @@
         SUPER(DebugPositionText, tick, dt);
         
-        ObjectList<NewHumanController>::iterator it = ObjectList<NewHumanController>::begin();
+        ObjectList<NewHumanController>::iterator it = ObjectList<NewHumanController>().begin();
         if (it && it->getControllableEntity() )
         {

code/trunk/src/modules/overlays/debugging/DebugPositionText.h

@@ -43 +43 @@
         virtual ~DebugPositionText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }

code/trunk/src/modules/overlays/debugging/DebugRTRText.h

@@ -43 +43 @@
         virtual ~DebugRTRText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }