STYLE: consistent use of '= delete'

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
+        //- No copy assignment
-        void operator=(const compressibleInterPhaseTransportModel&);
+        void operator=(const compressibleInterPhaseTransportModel&) = delete;
 
 
 public:

etc/codeTemplates/dynamicCode/codedPoints0MotionSolverTemplate.H

@@ -54,11 +54,14 @@ class ${typeName}Points0MotionSolver
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        ${typeName}Points0MotionSolver(const ${typeName}Points0MotionSolver&);
+        ${typeName}Points0MotionSolver
+        (
+            const ${typeName}Points0MotionSolver&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const ${typeName}Points0MotionSolver&);
+        void operator=(const ${typeName}Points0MotionSolver&) = delete;
 
 
 public:
@@ -88,7 +91,7 @@ public:
 
         //- Solve for motion
         virtual void solve()
-        {};
+        {}
 };
 
 

src/OpenFOAM/containers/Circulators/CirculatorBase/CirculatorBase.H

@@ -60,7 +60,8 @@ public:
     // Constructors
 
         //- Construct null
-        CirculatorBase(){};
+        CirculatorBase()
+        {}
 
 };
 

src/OpenFOAM/global/debug/simpleRegIOobject.H

@@ -66,8 +66,7 @@ public:
 
 
     //- Destructor
-    virtual ~simpleRegIOobject()
+    virtual ~simpleRegIOobject() = default;
-    {};
 
 
     // Member Functions

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
     {}

src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H

@@ -84,9 +84,11 @@ class kEpsilonLopesdaCosta
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
+        //- No copy construct
-        kEpsilonLopesdaCosta(const kEpsilonLopesdaCosta&);
+        kEpsilonLopesdaCosta(const kEpsilonLopesdaCosta&) = delete;
-        void operator=(const kEpsilonLopesdaCosta&);
+
+        //- No copy assignment
+        void operator=(const kEpsilonLopesdaCosta&) = delete;
 
 
 protected:
@@ -175,8 +177,7 @@ public:
 
 
     //- Destructor
-    virtual ~kEpsilonLopesdaCosta()
+    virtual ~kEpsilonLopesdaCosta() = default;
-    {}
 
 
     // Member Functions

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
+        //- No copy construct
-        void operator=(const powerLawLopesdaCosta&);
+        powerLawLopesdaCosta(const powerLawLopesdaCosta&) = delete;
+
+        //- No copy assignment
+        void operator=(const powerLawLopesdaCosta&) = delete;
 
 
 public:

src/combustionModels/CombustionModel/ChemistryCombustion/ChemistryCombustion.H

@@ -56,8 +56,10 @@ class ChemistryCombustion
     // Private Member Functions
 
         //- Construct as copy (not implemented)
-        ChemistryCombustion(const ChemistryCombustion<ReactionThermo>&) =
+        ChemistryCombustion
-            delete;
+        (
+            const ChemistryCombustion<ReactionThermo>&
+        ) = delete;
 
         //- No copy assignment
         void operator=(const ChemistryCombustion<ReactionThermo>&) = delete;

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
+        //- No copy assignment
-        codedPoints0MotionSolver(const codedPoints0MotionSolver&);
+        void operator=(const codedPoints0MotionSolver&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const codedPoints0MotionSolver&);
 
 
 public:

src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.H

@@ -111,7 +111,7 @@ public:
 
 
     //- Destructor
-    ~polyMeshFilterSettings(){};
+    ~polyMeshFilterSettings() = default;
 
 
     // Member Functions

src/engine/engineTime/freePiston/freePiston.H

@@ -81,11 +81,11 @@ class freePiston
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        freePiston(const freePiston&);
+        freePiston(const freePiston&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const freePiston&);
+        void operator=(const freePiston&) = delete;
 
 
 public:
@@ -108,8 +108,7 @@ public:
         );
 
     //- Destructor
-    virtual ~freePiston()
+    virtual ~freePiston() = default;
-    {}
 
 
     // Member Functions

src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H

@@ -89,11 +89,11 @@ class PhaseLimitStabilization
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        PhaseLimitStabilization(const PhaseLimitStabilization&);
+        PhaseLimitStabilization(const PhaseLimitStabilization&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const PhaseLimitStabilization&);
+        void operator=(const PhaseLimitStabilization&) = delete;
 
 
 public:
@@ -115,8 +115,7 @@ public:
 
 
     //- Destructor
-    virtual ~PhaseLimitStabilization()
+    virtual ~PhaseLimitStabilization() = default;
-    {}
 
 
     // Member Functions

src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C

@@ -161,12 +161,6 @@ waxSolventViscosity::waxSolventViscosity
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-waxSolventViscosity::~waxSolventViscosity()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void waxSolventViscosity::correct

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
+        //- No copy construct
-        waxSolventViscosity(const waxSolventViscosity&);
+        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

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_)

src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H

@@ -58,11 +58,11 @@ class waxSolventEvaporation
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        waxSolventEvaporation(const waxSolventEvaporation&);
+        waxSolventEvaporation(const waxSolventEvaporation&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const waxSolventEvaporation&);
+        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_;

src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H

@@ -108,8 +108,7 @@ public:
 
 
     //- Destructor
-    virtual ~OppositeFaceCellWave()
+    virtual ~OppositeFaceCellWave() = default;
-    {};
 
 
     // Member Functions

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>&) =
+        BasicChemistryModel
-            delete;
+        (
+            const BasicChemistryModel<ReactionThermo>&
+        ) = delete;
 
         //- No copy assignment
         void operator=(const BasicChemistryModel<ReactionThermo>&) = delete;