From 1a1322a2b09c6ac808cc6ed51edca4d53c49b7dc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 27 Jun 2023 09:14:35 +0200
Subject: [PATCH] COMP: avoid operator= masking (gcc-13)

---
 .../basicSymmetryPointPatchField.H            | 19 +++++++++++--------
 .../basicSymmetry/basicSymmetryFaPatchField.H |  8 +++++++-
 .../basicSymmetry/basicSymmetryFvPatchField.H |  8 +++++++-
 ...haContactAngleTwoPhaseFvPatchScalarField.C |  8 ++++----
 ...haContactAngleTwoPhaseFvPatchScalarField.H |  8 +++++++-
 5 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
index 9377eb2e07..c94efce3dd 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
@@ -119,16 +119,19 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Evaluation functions
+        //- Update the patch field
+        virtual void evaluate
+        (
+            const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+        );
 
-            //- Update the patch field
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType =
-                    Pstream::commsTypes::blocking
-            );
+
+    // Member Operators
+
+        //- Inherit assignment operators
+        using pointPatchField<Type>::operator=;
 };
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H
index 8e29f1b3bf..6e6ae1696c 100644
--- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H
@@ -124,7 +124,7 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
         // Evaluation functions
 
@@ -141,6 +141,12 @@ public:
 
             //- Return face-gradient transform diagonal
             virtual tmp<Field<Type>> snGradTransformDiag() const;
+
+
+    // Member Operators
+
+        //- Inherit assignment operators
+        using transformFaPatchField<Type>::operator=;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
index 8ffea2a438..bb730b23f5 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
@@ -122,7 +122,7 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
         //- Return gradient at boundary
         virtual tmp<Field<Type>> snGrad() const;
@@ -135,6 +135,12 @@ public:
 
         //- Return face-gradient transform diagonal
         virtual tmp<Field<Type>> snGradTransformDiag() const;
+
+
+    // Member Operators
+
+        //- Inherit assignment operators
+        using transformFvPatchField<Type>::operator=;
 };
 
 
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
index 5a13143fb0..798ca756ec 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
@@ -55,7 +55,7 @@ alphaContactAngleTwoPhaseFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(p, iF),
-    limit_(lcZeroGradient)
+    limit_(limitControls::lcZeroGradient)
 {}
 
 
@@ -128,7 +128,7 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    if (limit_ == lcGradient)
+    if (limit_ == limitControls::lcGradient)
     {
         gradient() =
         patch().deltaCoeffs()
@@ -137,14 +137,14 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
          - *this
        );
     }
-    else if (limit_ == lcZeroGradient)
+    else if (limit_ == limitControls::lcZeroGradient)
     {
         gradient() = Zero;
     }
 
     fixedGradientFvPatchScalarField::evaluate();
 
-    if (limit_ == lcAlpha)
+    if (limit_ == limitControls::lcAlpha)
     {
         scalarField::operator=(clamp(*this, zero_one{}));
     }
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H
index 0f96007058..12cff614f1 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H
@@ -136,7 +136,7 @@ public:
         );
 
 
-    // Member functions
+    // Member Functions
 
         //- Return the contact angle
         virtual tmp<scalarField> theta
@@ -153,6 +153,12 @@ public:
 
         //- Write
         virtual void write(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Inherit assignment operators
+        using fvPatchField<scalar>::operator=;
 };