From 9439d83f39cf32e339e9d46b1300e31080544e1b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 10 Jan 2016 12:49:35 +0000
Subject: [PATCH] Make private member functions private Resolves bug-report
http://openfoam.org/mantisbt/view.php?id=1969
---
.../Lists/IndirectList/IndirectList.H | 4 ++--
.../meshes/polyMesh/zones/cellZone/cellZone.H | 4 +++-
.../meshes/polyMesh/zones/faceZone/faceZone.H | 20 +++++++++++--------
.../fvMesh/fvBoundaryMesh/fvBoundaryMesh.H | 2 +-
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 030dfd9e30b..9b69d518923 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -107,10 +107,10 @@ class IndirectList
{
// Private Member Functions
- //- Disable default assignment operator
+ //- Disallow default assignment operator
void operator=(const IndirectList<T>&);
- //- Disable assignment from UIndirectList
+ //- Disallow assignment from UIndirectList
void operator=(const UIndirectList<T>&);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 0a6dbd671b1..c5027f3eaae 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -72,6 +72,8 @@ protected:
const cellZoneMesh& zoneMesh_;
+private:
+
// Private Member Functions
//- Disallow default bitwise copy construct
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 1567b09fb12..690c49e0314 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -71,6 +71,16 @@ class faceZone
//- The name associated with the zone-labels dictionary entry
static const word labelsName_;
+
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ faceZone(const faceZone&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const faceZone&);
+
+
protected:
// Protected data
@@ -98,13 +108,7 @@ protected:
mutable labelList* mePtr_;
- // Private Member Functions
-
- //- Disallow default bitwise copy construct
- faceZone(const faceZone&);
-
- //- Disallow default bitwise assignment
- void operator=(const faceZone&);
+ // Protected Member Functions
//- Build primitive patch
void calcFaceZonePatch() const;
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
index df961685515..62f5cda738e 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
@@ -62,7 +62,7 @@ class fvBoundaryMesh
// Private Member Functions
- //- Disable default copy construct
+ //- Disallow default copy construct
fvBoundaryMesh(const fvBoundaryMesh&);
//- Disallow assignment
--
GitLab