From e1dc3bae41ef7e5032f8dafed791158aa157db2f Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Mon, 5 Oct 2020 13:28:24 +0200
Subject: [PATCH] fix use of override inside PE
---
src/pe/cr/DEM.h | 2 +-
src/pe/cr/HCSITS.h | 2 +-
src/pe/fcd/SimpleFCDDataHandling.h | 2 +-
src/pe/rigidbody/Squirmer.h | 4 ++--
src/pe/rigidbody/Union.h | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/pe/cr/DEM.h b/src/pe/cr/DEM.h
index b839a0822..f716157ef 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 93657becb..742799f08 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 ae787ffe5..cae895ec3 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 5de26fbdd..41a27c9a7 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 160ce1ec6..e9337e069 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;
//@}
//**********************************************************************************************
--
GitLab