Commit f9fe7181 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: consistent use of '= delete' for removed constructors/assignments

- make the purpose more explicit, and reduces some work for the
  compiler as well.
parent 6b6b36af
......@@ -68,14 +68,14 @@ protected:
// Private Member Functions
//- Disallow copy construct
//- No copy construct
temperaturePhaseChangeTwoPhaseMixture
(
const temperaturePhaseChangeTwoPhaseMixture&
);
) = delete;
//- Disallow default bitwise assignment
void operator=(const temperaturePhaseChangeTwoPhaseMixture&);
//- No copy assignment
void operator=(const temperaturePhaseChangeTwoPhaseMixture&) = delete;
public:
......
......@@ -73,9 +73,15 @@ class threePhaseInterfaceProperties
// Private Member Functions
//- Disallow default bitwise copy construct and assignment
threePhaseInterfaceProperties(const threePhaseInterfaceProperties&);
void operator=(const threePhaseInterfaceProperties&);
//- No copy construct
threePhaseInterfaceProperties
(
const threePhaseInterfaceProperties&
) = delete;
//- No copy assignment
void operator=(const threePhaseInterfaceProperties&) = delete;
//- Correction for the boundary condition on the unit normal nHat on
// walls to produce the correct contact dynamic angle.
......
......@@ -69,11 +69,11 @@ protected:
// Private Member Functions
//- Disallow copy construct
phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&);
//- No copy construct
phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&) = delete;
//- Disallow default bitwise assignment
void operator=(const phaseChangeTwoPhaseMixture&);
//- No copy assignment
void operator=(const phaseChangeTwoPhaseMixture&) = delete;
public:
......
......@@ -52,11 +52,11 @@ class saturationModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
saturationModel(const saturationModel&);
//- No copy construct
saturationModel(const saturationModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const saturationModel&);
//- No copy assignment
void operator=(const saturationModel&) = delete;
public:
......
......@@ -58,11 +58,11 @@ class wallDependentModel
// Private Member Functions
//- Disallow default bitwise copy construct
wallDependentModel(const wallDependentModel&);
//- No copy construct
wallDependentModel(const wallDependentModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const wallDependentModel&);
//- No copy assignment
void operator=(const wallDependentModel&) = delete;
public:
......
......@@ -78,11 +78,14 @@ class BlendedInterfacialModel
// Private Member Functions
//- Disallow default bitwise copy construct
BlendedInterfacialModel(const BlendedInterfacialModel<ModelType>&);
//- No copy construct
BlendedInterfacialModel
(
const BlendedInterfacialModel&
) = delete;
//- Disallow default bitwise assignment
void operator=(const BlendedInterfacialModel<ModelType>&);
//- No copy assignment
void operator=(const BlendedInterfacialModel<ModelType>&) = delete;
//- Correct coeff/value on fixed flux boundary conditions
template<class GeometricField>
......
......@@ -57,11 +57,11 @@ class departureDiameterModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
departureDiameterModel(const departureDiameterModel&);
//- No copy construct
departureDiameterModel(const departureDiameterModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const departureDiameterModel&);
//- No copy assignment
void operator=(const departureDiameterModel&) = delete;
public:
......
......@@ -57,11 +57,11 @@ class departureFrequencyModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
departureFrequencyModel(const departureFrequencyModel&);
//- No copy construct
departureFrequencyModel(const departureFrequencyModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const departureFrequencyModel&);
//- No copy assignment
void operator=(const departureFrequencyModel&) = delete;
public:
......
......@@ -57,11 +57,11 @@ class nucleationSiteModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
nucleationSiteModel(const nucleationSiteModel&);
//- No copy construct
nucleationSiteModel(const nucleationSiteModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const nucleationSiteModel&);
//- No copy assignment
void operator=(const nucleationSiteModel&) = delete;
public:
......
......@@ -55,11 +55,11 @@ class partitioningModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
partitioningModel(const partitioningModel&);
//- No copy construct
partitioningModel(const partitioningModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const partitioningModel&);
//- No copy assignment
void operator=(const partitioningModel&) = delete;
public:
......
......@@ -52,11 +52,11 @@ class conductivityModel
{
// Private member functions
//- Disallow default bitwise copy construct
conductivityModel(const conductivityModel&);
//- No copy construct
conductivityModel(const conductivityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const conductivityModel&);
//- No copy assignment
void operator=(const conductivityModel&) = delete;
protected:
......
......@@ -53,11 +53,11 @@ class frictionalStressModel
{
// Private member functions
//- Disallow default bitwise copy construct
frictionalStressModel(const frictionalStressModel&);
//- No copy construct
frictionalStressModel(const frictionalStressModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const frictionalStressModel&);
//- No copy assignment
void operator=(const frictionalStressModel&) = delete;
protected:
......
......@@ -52,11 +52,11 @@ class granularPressureModel
{
// Private member functions
//- Disallow default bitwise copy construct
granularPressureModel(const granularPressureModel&);
//- No copy construct
granularPressureModel(const granularPressureModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const granularPressureModel&);
//- No copy assignment
void operator=(const granularPressureModel&) = delete;
protected:
......
......@@ -147,11 +147,11 @@ class kineticTheoryModel
void correctNut()
{}
//- Disallow default bitwise copy construct
kineticTheoryModel(const kineticTheoryModel&);
//- No copy construct
kineticTheoryModel(const kineticTheoryModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const kineticTheoryModel&);
//- No copy assignment
void operator=(const kineticTheoryModel&) = delete;
public:
......
......@@ -52,11 +52,11 @@ class radialModel
{
// Private member functions
//- Disallow default bitwise copy construct
radialModel(const radialModel&);
//- No copy construct
radialModel(const radialModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const radialModel&);
//- No copy assignment
void operator=(const radialModel&) = delete;
protected:
......
......@@ -54,11 +54,11 @@ class viscosityModel
{
// Private member functions
//- Disallow default bitwise copy construct
viscosityModel(const viscosityModel&);
//- No copy construct
viscosityModel(const viscosityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const viscosityModel&);
//- No copy assignment
void operator=(const viscosityModel&) = delete;
protected:
......
......@@ -102,11 +102,11 @@ class phasePressureModel
void correctNut()
{}
//- Disallow default bitwise copy construct
phasePressureModel(const phasePressureModel&);
//- No copy construct
phasePressureModel(const phasePressureModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const phasePressureModel&);
//- No copy assignment
void operator=(const phasePressureModel&) = delete;
public:
......
......@@ -58,11 +58,11 @@ class wallDependentModel
// Private Member Functions
//- Disallow default bitwise copy construct
wallDependentModel(const wallDependentModel&);
//- No copy construct
wallDependentModel(const wallDependentModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const wallDependentModel&);
//- No copy assignment
void operator=(const wallDependentModel&) = delete;
public:
......
......@@ -52,11 +52,11 @@ class conductivityModel
{
// Private member functions
//- Disallow default bitwise copy construct
conductivityModel(const conductivityModel&);
//- No copy construct
conductivityModel(const conductivityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const conductivityModel&);
//- No copy assignment
void operator=(const conductivityModel&) = delete;
protected:
......
......@@ -53,11 +53,11 @@ class frictionalStressModel
{
// Private member functions
//- Disallow default bitwise copy construct
frictionalStressModel(const frictionalStressModel&);
//- No copy construct
frictionalStressModel(const frictionalStressModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const frictionalStressModel&);
//- No copy assignment
void operator=(const frictionalStressModel&) = delete;
protected:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment