From dc521b95dfbb967ff3b94d63f9b70f70293ea239 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 30 May 2018 12:03:17 +0200
Subject: [PATCH] STYLE: consistent use of '= delete'
---
.../compressibleInterPhaseTransportModel.H | 8 ++++----
.../dynamicCode/codedPoints0MotionSolverTemplate.H | 13 ++++++++-----
.../Circulators/CirculatorBase/CirculatorBase.H | 3 ++-
src/OpenFOAM/global/debug/simpleRegIOobject.H | 3 +--
.../meshes/polyMesh/syncTools/dummyTransform.H | 4 +++-
.../kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H | 11 ++++++-----
.../powerLawLopesdaCosta/powerLawLopesdaCosta.H | 9 +++++----
.../ChemistryCombustion/ChemistryCombustion.H | 6 ++++--
.../codedPoints0/codedPoints0MotionSolver.H | 10 ++++------
.../polyMeshFilter/polyMeshFilterSettings.H | 2 +-
src/engine/engineTime/freePiston/freePiston.H | 11 +++++------
.../PhaseLimitStabilization.H | 11 +++++------
.../waxSolventViscosity/waxSolventViscosity.C | 6 ------
.../waxSolventViscosity/waxSolventViscosity.H | 8 ++++----
.../waxSolventEvaporation/waxSolventEvaporation.C | 2 +-
.../waxSolventEvaporation/waxSolventEvaporation.H | 10 +++++-----
.../structuredRenumber/OppositeFaceCellWave.H | 3 +--
.../BasicChemistryModel/BasicChemistryModel.H | 6 ++++--
18 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H
index b758ce3f9ad..72eabf12d1e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H
@@ -92,14 +92,14 @@ class compressibleInterPhaseTransportModel
// Private Member Functions
- //- Disallow default bitwise copy construct
+ //- No copy construct
compressibleInterPhaseTransportModel
(
const compressibleInterPhaseTransportModel&
- );
+ ) = delete;
- //- Disallow default bitwise assignment
- void operator=(const compressibleInterPhaseTransportModel&);
+ //- No copy assignment
+ void operator=(const compressibleInterPhaseTransportModel&) = delete;
public:
diff --git a/etc/codeTemplates/dynamicCode/codedPoints0MotionSolverTemplate.H b/etc/codeTemplates/dynamicCode/codedPoints0MotionSolverTemplate.H
index 0a6129c501f..67bcf4e67e5 100644
--- a/etc/codeTemplates/dynamicCode/codedPoints0MotionSolverTemplate.H
+++ b/etc/codeTemplates/dynamicCode/codedPoints0MotionSolverTemplate.H
@@ -54,11 +54,14 @@ class ${typeName}Points0MotionSolver
{
// Private Member Functions
- //- Disallow default bitwise copy construct
- ${typeName}Points0MotionSolver(const ${typeName}Points0MotionSolver&);
+ //- No copy construct
+ ${typeName}Points0MotionSolver
+ (
+ const ${typeName}Points0MotionSolver&
+ ) = delete;
- //- Disallow default bitwise assignment
- void operator=(const ${typeName}Points0MotionSolver&);
+ //- No copy assignment
+ void operator=(const ${typeName}Points0MotionSolver&) = delete;
public:
@@ -88,7 +91,7 @@ public:
//- Solve for motion
virtual void solve()
- {};
+ {}
};
diff --git a/src/OpenFOAM/containers/Circulators/CirculatorBase/CirculatorBase.H b/src/OpenFOAM/containers/Circulators/CirculatorBase/CirculatorBase.H
index d1ab166bab3..e9d503c6e53 100644
--- a/src/OpenFOAM/containers/Circulators/CirculatorBase/CirculatorBase.H
+++ b/src/OpenFOAM/containers/Circulators/CirculatorBase/CirculatorBase.H
@@ -60,7 +60,8 @@ public:
// Constructors
//- Construct null
- CirculatorBase(){};
+ CirculatorBase()
+ {}
};
diff --git a/src/OpenFOAM/global/debug/simpleRegIOobject.H b/src/OpenFOAM/global/debug/simpleRegIOobject.H
index c7ede5e8183..f1530ab2447 100644
--- a/src/OpenFOAM/global/debug/simpleRegIOobject.H
+++ b/src/OpenFOAM/global/debug/simpleRegIOobject.H
@@ -66,8 +66,7 @@ public:
//- Destructor
- virtual ~simpleRegIOobject()
- {};
+ virtual ~simpleRegIOobject() = default;
// Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
index 18aff56892e..c7e54bdf530 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
@@ -51,10 +51,12 @@ public:
const bool forward,
List<T>& fld
) const
- {};
+ {}
+
template<class T>
void operator()(const coupledPolyPatch& cpp, Field<T>& fld) const
{}
+
template<class T, template<class> class Container>
void operator()(const coupledPolyPatch& cpp, Container<T>& map) const
{}
diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H
index a9f2affd6ba..d1366d26eef 100644
--- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H
+++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H
@@ -84,9 +84,11 @@ class kEpsilonLopesdaCosta
{
// Private Member Functions
- // Disallow default bitwise copy construct and assignment
- kEpsilonLopesdaCosta(const kEpsilonLopesdaCosta&);
- void operator=(const kEpsilonLopesdaCosta&);
+ //- No copy construct
+ kEpsilonLopesdaCosta(const kEpsilonLopesdaCosta&) = delete;
+
+ //- No copy assignment
+ void operator=(const kEpsilonLopesdaCosta&) = delete;
protected:
@@ -175,8 +177,7 @@ public:
//- Destructor
- virtual ~kEpsilonLopesdaCosta()
- {}
+ virtual ~kEpsilonLopesdaCosta() = default;
// Member Functions
diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H
index f19677c808e..4957f2641b3 100644
--- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H
+++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H
@@ -146,11 +146,12 @@ class powerLawLopesdaCosta
const vectorField& U
) const;
- //- Disallow default bitwise copy construct
- powerLawLopesdaCosta(const powerLawLopesdaCosta&);
- //- Disallow default bitwise assignment
- void operator=(const powerLawLopesdaCosta&);
+ //- No copy construct
+ powerLawLopesdaCosta(const powerLawLopesdaCosta&) = delete;
+
+ //- No copy assignment
+ void operator=(const powerLawLopesdaCosta&) = delete;
public:
diff --git a/src/combustionModels/CombustionModel/ChemistryCombustion/ChemistryCombustion.H b/src/combustionModels/CombustionModel/ChemistryCombustion/ChemistryCombustion.H
index 20beb790e49..8a1d78aca1b 100644
--- a/src/combustionModels/CombustionModel/ChemistryCombustion/ChemistryCombustion.H
+++ b/src/combustionModels/CombustionModel/ChemistryCombustion/ChemistryCombustion.H
@@ -56,8 +56,10 @@ class ChemistryCombustion
// Private Member Functions
//- Construct as copy (not implemented)
- ChemistryCombustion(const ChemistryCombustion<ReactionThermo>&) =
- delete;
+ ChemistryCombustion
+ (
+ const ChemistryCombustion<ReactionThermo>&
+ ) = delete;
//- No copy assignment
void operator=(const ChemistryCombustion<ReactionThermo>&) = delete;
diff --git a/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H
index f8fa5e75d4d..d095d9481b1 100644
--- a/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H
@@ -117,13 +117,11 @@ protected:
virtual const dictionary& codeDict() const;
-private:
+ //- No copy assignment construct
+ codedPoints0MotionSolver(const codedPoints0MotionSolver&) = delete;
- //- Disallow default bitwise copy construct
- codedPoints0MotionSolver(const codedPoints0MotionSolver&);
-
- //- Disallow default bitwise assignment
- void operator=(const codedPoints0MotionSolver&);
+ //- No copy assignment
+ void operator=(const codedPoints0MotionSolver&) = delete;
public:
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.H
index 93bc4bd3b91..8a0419363ec 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.H
@@ -111,7 +111,7 @@ public:
//- Destructor
- ~polyMeshFilterSettings(){};
+ ~polyMeshFilterSettings() = default;
// Member Functions
diff --git a/src/engine/engineTime/freePiston/freePiston.H b/src/engine/engineTime/freePiston/freePiston.H
index 47fff4348d6..d01ead612b7 100644
--- a/src/engine/engineTime/freePiston/freePiston.H
+++ b/src/engine/engineTime/freePiston/freePiston.H
@@ -81,11 +81,11 @@ class freePiston
// Private Member Functions
- //- Disallow default bitwise copy construct
- freePiston(const freePiston&);
+ //- No copy construct
+ freePiston(const freePiston&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const freePiston&);
+ //- No copy assignment
+ void operator=(const freePiston&) = delete;
public:
@@ -108,8 +108,7 @@ public:
);
//- Destructor
- virtual ~freePiston()
- {}
+ virtual ~freePiston() = default;
// Member Functions
diff --git a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H
index a066303f47d..fbde975d847 100644
--- a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H
+++ b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H
@@ -89,11 +89,11 @@ class PhaseLimitStabilization
// Private Member Functions
- //- Disallow default bitwise copy construct
- PhaseLimitStabilization(const PhaseLimitStabilization&);
+ //- No copy construct
+ PhaseLimitStabilization(const PhaseLimitStabilization&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const PhaseLimitStabilization&);
+ //- No copy assignment
+ void operator=(const PhaseLimitStabilization&) = delete;
public:
@@ -115,8 +115,7 @@ public:
//- Destructor
- virtual ~PhaseLimitStabilization()
- {}
+ virtual ~PhaseLimitStabilization() = default;
// Member Functions
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C
index b3c4af2864e..4d4660cce7d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C
@@ -161,12 +161,6 @@ waxSolventViscosity::waxSolventViscosity
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-waxSolventViscosity::~waxSolventViscosity()
-{}
-
-
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void waxSolventViscosity::correct
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.H
index e437671772a..517a17452b5 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.H
@@ -59,10 +59,10 @@ class waxSolventViscosity
//- Correct the mixture viscosity
void correctMu();
- //- Disallow default bitwise copy construct
- waxSolventViscosity(const waxSolventViscosity&);
+ //- No copy construct
+ waxSolventViscosity(const waxSolventViscosity&) = delete;
- //- Disallow default bitwise assignment
+ //- No copy assignment
void operator=(const waxSolventViscosity&) = delete;
@@ -101,7 +101,7 @@ public:
//- Destructor
- virtual ~waxSolventViscosity();
+ virtual ~waxSolventViscosity() = default;
// Member Functions
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
index 0228c4a54cb..06d976e1b44 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
@@ -127,7 +127,7 @@ waxSolventEvaporation::waxSolventEvaporation
deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))),
L_(readScalar(coeffDict_.lookup("L"))),
TbFactor_(coeffDict_.lookupOrDefault<scalar>("TbFactor", 1.1)),
- YInfZero_(coeffDict_.lookupOrDefault<Switch>("YInfZero", false)),
+ YInfZero_(coeffDict_.lookupOrDefault("YInfZero", false)),
activityCoeff_
(
Function1<scalar>::New("activityCoeff", coeffDict_)
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
index 94d1a57e423..bec7d6e23fe 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
@@ -58,11 +58,11 @@ class waxSolventEvaporation
{
// Private member functions
- //- Disallow default bitwise copy construct
- waxSolventEvaporation(const waxSolventEvaporation&);
+ //- No copy construct
+ waxSolventEvaporation(const waxSolventEvaporation&) = delete;
- //- Disallow default bitwise assignment
- void operator=(const waxSolventEvaporation&);
+ //- No copy assignment
+ void operator=(const waxSolventEvaporation&) = delete;
protected:
@@ -92,7 +92,7 @@ protected:
const scalar TbFactor_;
//- Switch to treat YInf as zero
- Switch YInfZero_;
+ bool YInfZero_;
//- Activity coefficient as a function of solvent mole fraction
autoPtr<Function1<scalar>> activityCoeff_;
diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H
index 12701070822..584361e95d8 100644
--- a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H
+++ b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H
@@ -108,8 +108,7 @@ public:
//- Destructor
- virtual ~OppositeFaceCellWave()
- {};
+ virtual ~OppositeFaceCellWave() = default;
// Member Functions
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/BasicChemistryModel/BasicChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/BasicChemistryModel/BasicChemistryModel.H
index 9fc7e43cc52..757498ffd06 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/BasicChemistryModel/BasicChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/BasicChemistryModel/BasicChemistryModel.H
@@ -60,8 +60,10 @@ class BasicChemistryModel
// Private Member Functions
//- Construct as copy (not implemented)
- BasicChemistryModel(const BasicChemistryModel<ReactionThermo>&) =
- delete;
+ BasicChemistryModel
+ (
+ const BasicChemistryModel<ReactionThermo>&
+ ) = delete;
//- No copy assignment
void operator=(const BasicChemistryModel<ReactionThermo>&) = delete;
--
GitLab