Skip to content
Snippets Groups Projects
Commit e1dc3bae authored by Michael Kuron's avatar Michael Kuron :mortar_board:
Browse files

fix use of override inside PE

parent 95e81ea2
Branches
Tags
No related merge requests found
......@@ -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_; }
......
......@@ -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:
......
......@@ -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>
......
......@@ -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
......
......@@ -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;
//@}
//**********************************************************************************************
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment