Changeset 11054 for code/branches/cpp11_v3/src/orxonox/collisionshapes/WorldEntityCollisionShape.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/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

@@ -46 +46 @@
 
         protected:
-            virtual void updateParent();
+            virtual void updateParent() override;
 
         private:
-            void parentChanged();
+            virtual void parentChanged() override;
 
             WorldEntity* worldEntityOwner_;