diff --git a/src/pe/cr/DEM.h b/src/pe/cr/DEM.h index b839a0822f7a76a3c5f2f5c72637c191fb575779..f716157ef9f3302bf05195a3a280f534f9c280b1 100644 --- a/src/pe/cr/DEM.h +++ b/src/pe/cr/DEM.h @@ -57,7 +57,7 @@ public: /// Convenience operator to make class a functor. void operator()(const real_t dt) { timestep(dt); } /// Advances the simulation dt seconds. - void timestep( const real_t dt ); + void timestep( const real_t dt ) override; inline Integrator getIntegrator() const { return integrate_; } inline ContactResolver getContactResolver() const { return resolveContact_; } diff --git a/src/pe/cr/HCSITS.h b/src/pe/cr/HCSITS.h index 93657becb7bf9e3d12c3182c9b365740723c5e70..742799f0833916273632ea816bfa9ff548c59427 100644 --- a/src/pe/cr/HCSITS.h +++ b/src/pe/cr/HCSITS.h @@ -169,7 +169,7 @@ public: /// Convenience operator to make class a functor. void operator()(const real_t dt) { timestep(dt); } /// Advances the simulation dt seconds. - void timestep( const real_t dt ); + void timestep( const real_t dt ) override; private: diff --git a/src/pe/fcd/SimpleFCDDataHandling.h b/src/pe/fcd/SimpleFCDDataHandling.h index ae787ffe54b41749cbc2f4471a1626bd9209a403..cae895ec3799918ab9a11e49641b778751644e41 100644 --- a/src/pe/fcd/SimpleFCDDataHandling.h +++ b/src/pe/fcd/SimpleFCDDataHandling.h @@ -34,8 +34,8 @@ public: SimpleFCD<BodyTypeTuple> * initialize( IBlock * const /*block*/ ) {return new SimpleFCD<BodyTypeTuple>();} }; -[[deprecated("Use createGenericFCDDataHandling<BodyTypeTuple, AnalyticCollideFunctor>() instead")]] template <typename BodyTypeTuple> +[[deprecated("Use createGenericFCDDataHandling<BodyTypeTuple, AnalyticCollideFunctor>() instead")]] shared_ptr<SimpleFCDDataHandling<BodyTypeTuple> > createSimpleFCDDataHandling(); template <typename BodyTypeTuple> diff --git a/src/pe/rigidbody/Squirmer.h b/src/pe/rigidbody/Squirmer.h index 5de26fbddf3f9440a22e4d3b369f21d06999510d..41a27c9a78474ff82a677d45bb4a5e4af65da3ff 100644 --- a/src/pe/rigidbody/Squirmer.h +++ b/src/pe/rigidbody/Squirmer.h @@ -58,7 +58,7 @@ public: inline Vec3 velFromWF ( real_t px, real_t py, real_t pz ) const override; inline Vec3 velFromWF ( const Vec3& gpos ) const override; - static inline id_t getStaticTypeID() override; + static inline id_t getStaticTypeID(); //@} //********************************************************************************************** @@ -80,7 +80,7 @@ protected: private: static id_t staticTypeID_; //< type id of sphere, will be set by SetBodyTypeIDs - static void setStaticTypeID(id_t typeID) override {staticTypeID_ = typeID;} + static void setStaticTypeID(id_t typeID) {staticTypeID_ = typeID;} //** friend declaration /// needed to be able to set static type ids with setStaticTypeID diff --git a/src/pe/rigidbody/Union.h b/src/pe/rigidbody/Union.h index 160ce1ec6b171e2d675f994b1f2fdaf023b97d93..e9337e069d82375ffcbc48b605cfb4b8c71fc461 100644 --- a/src/pe/rigidbody/Union.h +++ b/src/pe/rigidbody/Union.h @@ -121,7 +121,7 @@ public: //@} //********************************************************************************************** - virtual inline real_t getVolume() const; + virtual inline real_t getVolume() const override; //**Set functions******************************************************************************* /*!\name Set functions */ @@ -158,7 +158,7 @@ public: //**Output functions**************************************************************************** /*!\name Output functions */ //@{ - virtual void print( std::ostream& os, const char* tab ) const; + virtual void print( std::ostream& os, const char* tab ) const override; //@} //**********************************************************************************************