Changeset 10845 for code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h

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

File:

• code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h

@@ -52 +52 @@
             using WorldEntity::setOrientation;
 
-            inline void setPosition(const Vector3& position) override
+            virtual inline void setPosition(const Vector3& position) override
                 { MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
-            inline void setOrientation(const Quaternion& orientation) override
+            virtual inline void setOrientation(const Quaternion& orientation) override
                 { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
 
@@ -79 +79 @@
         private:
             void registerVariables();
-            void clientConnected(unsigned int clientID) override;
-            void clientDisconnected(unsigned int clientID) override;
+            virtual void clientConnected(unsigned int clientID) override;
+            virtual void clientDisconnected(unsigned int clientID) override;
             void resynchronize();