From 4bce2d6c8aa8254736bafa64027de936cee5ed95 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Mon, 13 Jul 2020 16:57:53 +0200
Subject: [PATCH] pe_coupling: Declare pe_coupling::overlapFractionPe inline
Defining this function in a header without inline/static specifier may
lead to ODR violations.
---
src/pe_coupling/geometry/PeOverlapFraction.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pe_coupling/geometry/PeOverlapFraction.h b/src/pe_coupling/geometry/PeOverlapFraction.h
index 7193aae0a..f8bae664e 100644
--- a/src/pe_coupling/geometry/PeOverlapFraction.h
+++ b/src/pe_coupling/geometry/PeOverlapFraction.h
@@ -34,8 +34,8 @@ namespace walberla {
namespace pe_coupling{
-real_t overlapFractionPe( const pe::RigidBody & peRigidBody, const Vector3<real_t> & cellMidpoint,
- const Vector3<real_t> & dx, uint_t maxDepth=4 )
+inline real_t overlapFractionPe( const pe::RigidBody & peRigidBody, const Vector3<real_t> & cellMidpoint,
+ const Vector3<real_t> & dx, uint_t maxDepth=4 )
{
if( peRigidBody.getTypeID() == pe::Sphere::getStaticTypeID() || peRigidBody.getTypeID() == pe::Squirmer::getStaticTypeID() )
{
--
GitLab