Changeset 10845 for code/branches/cpp11_v2/src/orxonox/collisionshapes

Timestamp:

Nov 23, 2015, 10:20:29 PM (9 years ago)

Author:

landauf

Message:

always use 'virtual' in the declaration of virtual functions even if they are inherited

Location:

code/branches/cpp11_v2/src/orxonox/collisionshapes

Files:

• CompoundCollisionShape.h (modified) (1 diff)
• WorldEntityCollisionShape.h (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h

@@ -74 +74 @@
         private:
             void updatePublicShape();
-            inline virtual btCollisionShape* createNewShape() const override
+            virtual inline btCollisionShape* createNewShape() const override
                 { assert(false); return nullptr; }
 

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

@@ -49 +49 @@
 
         private:
-            void parentChanged() override;
+            virtual void parentChanged() override;
 
             WorldEntity* worldEntityOwner_;