From 5fe4e62b27b74de5198095d0069d33134b8f1d4c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 27 Jun 2019 19:24:54 +0200
Subject: [PATCH] STYLE: can use objectRegistry::checkOut() directly with a
pointer
---
src/OpenFOAM/db/regIOobject/regIOobject.C | 2 +-
src/OpenFOAM/meshes/MeshObject/MeshObject.C | 27 ++++++++++---------
.../sampledSurface/sampledSurfaceRegister.C | 16 ++---------
3 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 62229d30a04..3d0e09e4190 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -239,7 +239,7 @@ bool Foam::regIOobject::checkOut()
{
registered_ = false;
- return db().checkOut(*this);
+ return db().checkOut(this);
}
return false;
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
index 1816bf9fad6..d41bda7f742 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010, 2018 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2010, 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -94,7 +94,7 @@ bool Foam::MeshObject<Mesh, MeshObjectType, Type>::Delete(const Mesh& mesh)
<< Type::typeName << endl;
}
- return mesh.thisDb().checkOut(*ptr);
+ return mesh.thisDb().checkOut(ptr);
}
return false;
@@ -118,9 +118,8 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
forAllIters(meshObjects, iter)
{
- // Same as (isA<MoveableMeshObject<Mesh>>(*iter()))
-
- auto* objectPtr = dynamic_cast<MoveableMeshObject<Mesh>*>(iter());
+ // isA<MoveableMeshObject<Mesh>>
+ auto* objectPtr = dynamic_cast<MoveableMeshObject<Mesh>*>(*iter);
if (objectPtr)
{
@@ -136,7 +135,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
{
Pout<< " Destroying " << iter->name() << endl;
}
- obr.checkOut(*iter());
+ obr.checkOut(*iter);
}
}
}
@@ -159,9 +158,8 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
forAllIters(meshObjects, iter)
{
- // Same as (isA<UpdateableMeshObject<Mesh>>(*iter()))
-
- auto* objectPtr = dynamic_cast<UpdateableMeshObject<Mesh>*>(iter());
+ // isA<MoveableMeshObject<Mesh>>
+ auto* objectPtr = dynamic_cast<UpdateableMeshObject<Mesh>*>(*iter);
if (objectPtr)
{
@@ -177,7 +175,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
{
Pout<< " Destroying " << iter->name() << endl;
}
- obr.checkOut(*iter());
+ obr.checkOut(*iter);
}
}
}
@@ -204,7 +202,7 @@ void Foam::meshObject::clear(objectRegistry& obr)
{
Pout<< " Destroying " << iter->name() << endl;
}
- obr.checkOut(*iter());
+ obr.checkOut(*iter);
}
}
@@ -231,13 +229,16 @@ void Foam::meshObject::clearUpto(objectRegistry& obr)
forAllIters(meshObjects, iter)
{
- if (!isA<ToType<Mesh>>(*iter()))
+ // isA<ToType<Mesh>
+ auto* objectPtr = dynamic_cast<ToType<Mesh>*>(*iter);
+
+ if (!objectPtr)
{
if (meshObject::debug)
{
Pout<< " Destroying " << iter->name() << endl;
}
- obr.checkOut(*iter());
+ obr.checkOut(*iter);
}
}
}
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceRegister.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceRegister.C
index ab2438fc643..dfea8aa2d3b 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceRegister.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceRegister.C
@@ -77,13 +77,7 @@ bool Foam::sampledSurface::removeRegistrySurface
) const
{
polySurface* surfptr = getRegistrySurface(obr, lookupName);
-
- if (surfptr)
- {
- return obr.checkOut(*surfptr);
- }
-
- return false;
+ return obr.checkOut(surfptr);
}
@@ -124,13 +118,7 @@ Foam::surfMesh* Foam::sampledSurface::storeSurfMesh(word lookupName) const
bool Foam::sampledSurface::removeSurfMesh(word lookupName) const
{
surfMesh* surfptr = getSurfMesh(lookupName);
-
- if (surfptr)
- {
- return mesh().checkOut(*surfptr);
- }
-
- return false;
+ return mesh().checkOut(surfptr);
}
--
GitLab