From 207806e55df2fe468dfe18d049f16b98b38866b7 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Wed, 18 Dec 2024 10:01:45 +0100 Subject: [PATCH] COMP: explicitly declare copy construct for (point) symmetry field - fixes -Wdeprecated-copy complaints --- .../basicSymmetry/basicSymmetryPointPatchField.H | 11 ++++++++--- .../basic/basicSymmetry/basicSymmetryFaPatchField.C | 10 ---------- .../basic/basicSymmetry/basicSymmetryFaPatchField.H | 9 ++++----- .../basic/basicSymmetry/basicSymmetryFvPatchField.C | 11 ----------- .../basic/basicSymmetry/basicSymmetryFvPatchField.H | 8 ++++---- 5 files changed, 16 insertions(+), 33 deletions(-) diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H index d132cc222bd..2f358e786f4 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H @@ -34,8 +34,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef basicSymmetryPointPatchField_H -#define basicSymmetryPointPatchField_H +#ifndef Foam_basicSymmetryPointPatchField_H +#define Foam_basicSymmetryPointPatchField_H #include "pointPatchField.H" #include "symmetryPointPatch.H" @@ -54,7 +54,6 @@ class basicSymmetryPointPatchField : public pointPatchField<Type> { - public: // Constructors @@ -83,6 +82,12 @@ public: const pointPatchFieldMapper& ); + //- Default copy construct + basicSymmetryPointPatchField + ( + const basicSymmetryPointPatchField<Type>& + ) = default; + //- Construct as copy setting internal field reference basicSymmetryPointPatchField ( diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C index d828c81eb82..63bab592068 100644 --- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C +++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C @@ -68,16 +68,6 @@ Foam::basicSymmetryFaPatchField<Type>::basicSymmetryFaPatchField } -template<class Type> -Foam::basicSymmetryFaPatchField<Type>::basicSymmetryFaPatchField -( - const basicSymmetryFaPatchField<Type>& ptf -) -: - transformFaPatchField<Type>(ptf) -{} - - template<class Type> Foam::basicSymmetryFaPatchField<Type>::basicSymmetryFaPatchField ( diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H index 8ff67f1b0c7..83f3c0ad896 100644 --- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H +++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H @@ -38,8 +38,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef basicSymmetryFaPatchField_H -#define basicSymmetryFaPatchField_H +#ifndef Foam_basicSymmetryFaPatchField_H +#define Foam_basicSymmetryFaPatchField_H #include "transformFaPatchField.H" #include "symmetryFaPatch.H" @@ -58,7 +58,6 @@ class basicSymmetryFaPatchField : public transformFaPatchField<Type> { - public: // Constructors @@ -89,11 +88,11 @@ public: const faPatchFieldMapper& ); - //- Construct as copy + //- Default copy construct basicSymmetryFaPatchField ( const basicSymmetryFaPatchField<Type>& - ); + ) = default; //- Construct as copy setting internal field reference basicSymmetryFaPatchField diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C index 34b93a99f43..5d45a94aeae 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C @@ -28,7 +28,6 @@ License #include "basicSymmetryFvPatchField.H" #include "symmTransformField.H" - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template<class Type> @@ -69,16 +68,6 @@ Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField } -template<class Type> -Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField -( - const basicSymmetryFvPatchField<Type>& ptf -) -: - transformFvPatchField<Type>(ptf) -{} - - template<class Type> Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H index 30d2268cfd0..3135c1662cd 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H @@ -38,8 +38,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef basicSymmetryFvPatchField_H -#define basicSymmetryFvPatchField_H +#ifndef Foam_basicSymmetryFvPatchField_H +#define Foam_basicSymmetryFvPatchField_H #include "transformFvPatchField.H" #include "symmetryFvPatch.H" @@ -88,11 +88,11 @@ public: const fvPatchFieldMapper& ); - //- Construct as copy + //- Default copy construct basicSymmetryFvPatchField ( const basicSymmetryFvPatchField<Type>& - ); + ) = default; //- Construct as copy setting internal field reference basicSymmetryFvPatchField -- GitLab