From 0642eb7c4ae498dc430cbdf32213fbfba08193e8 Mon Sep 17 00:00:00 2001 From: Danial Khazaei Date: Fri, 15 Feb 2019 22:30:51 +0330 Subject: [PATCH 1/5] [bugfix]: friend operators need forward declaration to avoid gcc warning. Without forward declaration, gcc warns that the operator has not been declared within foam but only as a friend. --- .../rotationalConstraint/rotationalConstraint.H | 8 ++++++++ .../translationalConstraint.H | 8 ++++++++ .../combinedRestraint/combinedRestraint.H | 8 ++++++++ .../rotationalRestraint/rotationalRestraint.H | 8 ++++++++ .../translationalRestraint/translationalRestraint.H | 8 ++++++++ src/ODE/sixDOF/sixDOFqODE/sixDOFqODE.H | 6 ++++++ src/ODE/translationODE/translationODE.H | 6 ++++++ src/OSspecific/POSIX/memInfo/memInfo.H | 11 +++++++++++ src/conversion/ensight/part/ensightPart.H | 7 +++++++ src/conversion/ensight/part/ensightParts.H | 6 ++++++ .../directTopoChange/boundaryMesh/boundaryPatch.H | 6 ++++++ .../directions/directionInfo/directionInfo.H | 10 ++++++++++ .../meshCut/refineCell/refineCell.H | 8 ++++++++ .../wallLayerCells/wallNormalInfo/wallNormalInfo.H | 8 ++++++++ .../polyMeshModifier/polyMeshModifier.H | 7 +++++++ .../polyTopoChanger/polyTopoChanger.H | 10 ++++++++-- .../dynamicMesh/refinementData/refinementData.H | 9 +++++++++ .../refinementData/refinementDistanceData.H | 9 +++++++++ .../dynamicMesh/refinementData/refinementHistory.H | 13 +++++++++++++ src/edgeMesh/edgeMesh.H | 7 +++++++ src/equationReader/equationReader/equationReader.H | 7 +++++-- src/finiteArea/faMesh/faPatches/faPatch/faPatch.H | 5 +++++ .../cfdTools/general/porousMedia/porousZone.H | 8 ++++++++ src/foam/algorithms/octree/octree/octreeDataPoint.H | 8 ++++++++ src/foam/algorithms/octree/octree/treeBoundBox.H | 12 ++++++++++++ src/foam/algorithms/octree/octree/treeLeaf.H | 4 +++- src/foam/algorithms/octree/octree/treeNode.H | 5 +++-- .../HashTables/HashPtrTable/HashPtrTable.H | 1 + .../containers/HashTables/HashTable/HashTable.H | 6 ++++-- .../HashTables/StaticHashTable/StaticHashTable.H | 4 +++- .../LinkedLists/accessTypes/ILList/ILList.H | 1 + .../LinkedLists/accessTypes/LList/LList.H | 1 + .../LinkedLists/accessTypes/UILList/UILList.H | 1 + src/foam/containers/Lists/FixedList/FixedList.H | 8 +++++--- src/foam/coordinateSystems/coordinateSystem.H | 10 +++++++++- src/foam/db/IOobjects/CompactIOList/CompactIOList.H | 3 +++ src/foam/db/dictionary/dictionary.H | 8 ++++++-- .../db/dictionary/dictionaryEntry/dictionaryEntry.H | 5 +++++ .../dimensionedType/dimensionedType.H | 4 +++- src/foam/fields/CoeffField/diagTensorCoeffField.H | 11 +++++++++++ src/foam/fields/CoeffField/scalarCoeffField.H | 11 +++++++++++ .../fields/CoeffField/sphericalTensorCoeffField.H | 11 +++++++++++ .../CoeffField/symmTensor4thOrderCoeffField.H | 11 +++++++++++ src/foam/fields/CoeffField/symmTensorCoeffField.H | 11 +++++++++++ src/foam/fields/CoeffField/tensorCoeffField.H | 11 +++++++++++ .../GeometricFields/GeometricField/GeometricField.H | 1 + src/foam/matrices/LUscalarMatrix/procLduInterface.H | 8 ++++++++ src/foam/matrices/LUscalarMatrix/procLduMatrix.H | 1 + src/foam/matrices/crMatrix/crAddressing.H | 5 +++++ src/foam/matrices/crMatrix/crMatrix.H | 5 +++++ src/foam/meshes/boundBox/boundBox.H | 3 ++- src/foam/meshes/meshShapes/face/face.H | 9 ++++++--- src/foam/meshes/meshShapes/triFace/triFace.H | 2 ++ src/foam/meshes/patchIdentifier/patchIdentifier.H | 2 ++ src/foam/meshes/polyMesh/zones/ZoneID/ZoneID.H | 1 + src/foam/meshes/polyMesh/zones/faceZone/faceZone.H | 2 ++ .../primitiveShapes/tetrahedron/tetrahedron.H | 1 + src/foam/meshes/primitiveShapes/triangle/triangle.H | 1 + src/foam/primitives/BlockCoeff/scalarBlockCoeff.H | 5 +++++ src/foam/primitives/Lists/hashedWordList.H | 3 ++- src/foam/primitives/bools/Switch/Switch.H | 4 +++- src/foam/primitives/strings/fileName/fileName.H | 1 + src/foam/primitives/strings/keyType/keyType.H | 5 +++++ src/foam/primitives/strings/wordRe/wordRe.H | 7 +++++-- src/lagrangian/basic/Particle/Particle.H | 1 + src/lagrangian/dieselSpray/parcel/parcel.H | 8 ++++++++ .../phaseProperties/phaseProperties.H | 7 +++++++ .../referralLists/receivingReferralList.H | 7 +++++++ .../referralLists/sendingReferralList.H | 7 +++++++ .../referredMolecule/referredMolecule.H | 10 ++++++++++ .../molecularDynamics/molecule/molecule/molecule.H | 6 +++++- .../molecule/reducedUnits/reducedUnits.H | 6 ++++++ src/lagrangian/solidParticle/solidParticle.H | 5 +++++ .../autoHexMeshDriver/pointData/pointData.H | 10 +++++++++- .../autoHexMesh/trackedParticle/ExactParticle.H | 1 + .../autoHexMesh/trackedParticle/trackedParticle.H | 8 ++++++++ src/mesh/blockMesh/block/block.H | 4 ++++ .../blockMesh/blockDescriptor/blockDescriptor.H | 3 +++ src/mesh/blockMesh/curvedEdges/curvedEdge.H | 6 ++++++ src/meshTools/PointEdgeWave/pointEdgePoint.H | 8 ++++++++ src/meshTools/cellClassification/cellInfo.H | 10 ++++++++++ src/meshTools/cellDist/wallPoint/wallPoint.H | 4 +++- src/meshTools/cellDist/wallPoint/wallPointData.H | 1 + .../triSurface/surfaceLocation/surfaceLocation.H | 8 ++++++++ .../triSurface/interfaces/STL/STLtriangle.H | 6 ++++++ .../triSurface/surfacePatch/surfacePatch.H | 6 ++++++ .../triSurface/surfacePatch/surfacePatchIOList.H | 4 ++++ src/meshTools/triSurface/triSurface/triSurface.H | 8 ++++++++ .../sampledSurface/sampledSurface/sampledSurface.H | 6 ++++++ src/surfMesh/surfZone/surfZone/surfZoneIOList.H | 6 +++++- .../surfZoneIdentifier/surfZoneIdentifier.H | 3 +++ src/surfMesh/surfaceFormats/stl/STLtriangle.H | 6 ++++++ .../aungierRedlichKwong/aungierRedlichKwong.H | 6 ++++++ .../pengRobinson/pengRobinson.H | 6 ++++++ .../redlichKwong/redlichKwong.H | 6 ++++++ .../soaveRedlichKwong/soaveRedlichKwong.H | 6 ++++++ src/thermophysicalModels/specie/specie/specie.H | 8 ++++++++ .../specie/speciesTable/speciesTable.H | 6 ++++++ .../decayingTurbulence/decayingVorton.H | 10 ++++++++++ 99 files changed, 580 insertions(+), 29 deletions(-) diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H index 4bbf61634..d1209f755 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H +++ b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H @@ -72,8 +72,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class sixDOFODE; +// Forward declaration of friend functions and operators + +class rotationalConstraint; + +Ostream& operator<<(Ostream&, const rotationalConstraint&); + + /*---------------------------------------------------------------------------*\ Class rotationalConstraint Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H index 08104e909..7d857e70d 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H +++ b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H @@ -72,8 +72,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class sixDOFODE; +// Forward declaration of friend functions and operators + +class translationalConstraint; + +Ostream& operator<<(Ostream&, const translationalConstraint&); + + /*---------------------------------------------------------------------------*\ Class translationalConstraint Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H index 15519b7a3..43d057288 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H @@ -54,8 +54,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class sixDOFODE; +// Forward declaration of friend functions and operators + +class combinedRestraint; + +Ostream& operator<<(Ostream&, const combinedRestraint&); + + /*---------------------------------------------------------------------------*\ Class combinedRestraint Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H index 6aed49eef..9f82ca9a6 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H @@ -54,8 +54,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class sixDOFODE; +// Forward declaration of friend functions and operators + +class rotationalRestraint; + +Ostream& operator<<(Ostream&, const rotationalRestraint&); + + /*---------------------------------------------------------------------------*\ Class rotationalRestraint Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H index bfb1f434f..a0b0b8de6 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H @@ -54,8 +54,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class sixDOFODE; +// Forward declaration of friend functions and operators + +class translationalRestraint; + +Ostream& operator<<(Ostream&, const translationalRestraint&); + + /*---------------------------------------------------------------------------*\ Class translationalRestraint Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/ODE/sixDOF/sixDOFqODE/sixDOFqODE.H b/src/ODE/sixDOF/sixDOFqODE/sixDOFqODE.H index e84157b92..a945c6c93 100644 --- a/src/ODE/sixDOF/sixDOFqODE/sixDOFqODE.H +++ b/src/ODE/sixDOF/sixDOFqODE/sixDOFqODE.H @@ -52,6 +52,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class sixDOFqODE; + +Ostream& operator<<(Ostream&, const sixDOFqODE&); + + /*---------------------------------------------------------------------------*\ Class sixDOFqODE Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/ODE/translationODE/translationODE.H b/src/ODE/translationODE/translationODE.H index d7d32cefc..18838a1e9 100644 --- a/src/ODE/translationODE/translationODE.H +++ b/src/ODE/translationODE/translationODE.H @@ -51,6 +51,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class translationODE; + +Ostream& operator<<(Ostream&, const translationODE&); + + /*---------------------------------------------------------------------------*\ Class translationODE Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/OSspecific/POSIX/memInfo/memInfo.H b/src/OSspecific/POSIX/memInfo/memInfo.H index cf660d34f..4ecdf9930 100644 --- a/src/OSspecific/POSIX/memInfo/memInfo.H +++ b/src/OSspecific/POSIX/memInfo/memInfo.H @@ -47,6 +47,17 @@ SourceFiles namespace Foam { +// Forward declaration of classes +class Istream; +class Ostream; + +// Forward declaration of friend functions and operators + +class memInfo; + +Istream& operator>>(Istream&, memInfo&); +Ostream& operator<<(Ostream&, const memInfo&); + /*---------------------------------------------------------------------------*\ Class memInfo Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H index eb60906bd..f2c609f07 100644 --- a/src/conversion/ensight/part/ensightPart.H +++ b/src/conversion/ensight/part/ensightPart.H @@ -51,6 +51,13 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class ensightPart; + +Ostream& operator<<(Ostream&, const ensightPart&); +ensightGeoFile& operator<<(ensightGeoFile&, const ensightPart&); + + /*---------------------------------------------------------------------------*\ Class ensightPart Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H index bbd4bde03..7a4b0c2e6 100644 --- a/src/conversion/ensight/part/ensightParts.H +++ b/src/conversion/ensight/part/ensightParts.H @@ -46,6 +46,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class ensightParts; + +ensightGeoFile& operator<<(ensightGeoFile&, const ensightParts&); + + /*---------------------------------------------------------------------------*\ Class ensightParts Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/boundaryMesh/boundaryPatch.H b/src/dynamicMesh/dynamicMesh/directTopoChange/boundaryMesh/boundaryPatch.H index 34e1106f2..3a31d0377 100644 --- a/src/dynamicMesh/dynamicMesh/directTopoChange/boundaryMesh/boundaryPatch.H +++ b/src/dynamicMesh/dynamicMesh/directTopoChange/boundaryMesh/boundaryPatch.H @@ -44,6 +44,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class boundaryPatch; + +Ostream& operator<<(Ostream&, const boundaryPatch&); + + /*---------------------------------------------------------------------------*\ Class boundaryPatch Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H index 36a79cc36..300d7d72e 100644 --- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H +++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H @@ -62,6 +62,8 @@ SourceFiles namespace Foam { + +// Forward declaration of classes class polyPatch; class polyMesh; class primitiveMesh; @@ -69,6 +71,14 @@ class edge; class face; class polyMesh; +// Forward declaration of friend functions and operators + +class directionInfo; + +Ostream& operator<<(Ostream&, const directionInfo&); +Istream& operator>>(Istream&, directionInfo&); + + /*---------------------------------------------------------------------------*\ Class directionInfo Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H index ccfa90941..62e55bec7 100644 --- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H +++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H @@ -43,9 +43,17 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; +// Forward declaration of friend functions and operators + +class refineCell; + +Ostream& operator<<(Ostream&, const refineCell&); + + /*---------------------------------------------------------------------------*\ Class refineCell Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H index 72a9acd28..bb6b6b5fa 100644 --- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H +++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H @@ -51,6 +51,14 @@ namespace Foam class polyPatch; class polyMesh; +// Forward declaration of friend functions and operators + +class wallNormalInfo; + +Ostream& operator<<(Ostream&, const wallNormalInfo&); +Istream& operator>>(Istream&, wallNormalInfo&); + + /*---------------------------------------------------------------------------*\ Class wallNormalInfo Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H index 244eb570c..b1aacf437 100644 --- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H +++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H @@ -55,6 +55,13 @@ class polyTopoChanger; class polyTopoChange; class mapPolyMesh; +// Forward declaration of friend functions and operators + +class polyMeshModifier; + +Ostream& operator<<(Ostream&, const polyMeshModifier&); + + /*---------------------------------------------------------------------------*\ Class polyMeshModifier Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H index 7926a4343..f9aac08ed 100644 --- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H +++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H @@ -44,12 +44,18 @@ SourceFiles namespace Foam { -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - +// Forward declaration of classes class polyMesh; class mapPolyMesh; class polyBoundaryMesh; +// Forward declaration of friend functions and operators + +class polyTopoChanger; + +Ostream& operator<<(Ostream&, const polyTopoChanger&); + + /*---------------------------------------------------------------------------*\ Class polyTopoChanger Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H b/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H index 8f25a31af..3c3a5e196 100644 --- a/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H +++ b/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H @@ -45,9 +45,18 @@ SourceFiles namespace Foam { +// Forward declaration of classes class polyPatch; class polyMesh; +// Forward declaration of friend functions and operators + +class refinementData; + +Ostream& operator<<(Ostream&, const refinementData&); +Istream& operator>>(Istream&, refinementData&); + + /*---------------------------------------------------------------------------*\ Class refinementData Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H b/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H index 1145fa55a..a4024dd52 100644 --- a/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H +++ b/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H @@ -45,9 +45,18 @@ SourceFiles namespace Foam { +// Forward declaration of classes class polyPatch; class polyMesh; +// Forward declaration of friend functions and operators + +class refinementDistanceData; + +Ostream& operator<<(Ostream&, const refinementDistanceData&); +Istream& operator>>(Istream&, refinementDistanceData&); + + /*---------------------------------------------------------------------------*\ Class refinementDistanceData Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H b/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H index aaf5a6d45..1df11ef81 100644 --- a/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H +++ b/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H @@ -87,6 +87,15 @@ namespace Foam // Forward declaration of classes class mapPolyMesh; class mapDistributePolyMesh; +class polyMesh; + +// Forward declaration of friend functions and operators + +class refinementHistory; + +Ostream& operator<<(Ostream&, const refinementHistory&); +Istream& operator>>(Istream&, refinementHistory&); + /*---------------------------------------------------------------------------*\ Class refinementHistory Declaration @@ -360,6 +369,10 @@ public: }; +Istream& operator>>(Istream&, refinementHistory::splitCell8&); +Ostream& operator<<(Ostream&, const refinementHistory::splitCell8&); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/edgeMesh/edgeMesh.H b/src/edgeMesh/edgeMesh.H index f3560ab41..eabb780ae 100644 --- a/src/edgeMesh/edgeMesh.H +++ b/src/edgeMesh/edgeMesh.H @@ -45,6 +45,13 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class edgeMesh; + +Ostream& operator<<(Ostream&, const edgeMesh&); +Istream& operator>>(Istream&, edgeMesh&); + + /*---------------------------------------------------------------------------*\ Class edgeMesh Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/equationReader/equationReader/equationReader.H b/src/equationReader/equationReader/equationReader.H index a91822dd4..9b13409f2 100644 --- a/src/equationReader/equationReader/equationReader.H +++ b/src/equationReader/equationReader/equationReader.H @@ -107,16 +107,19 @@ Author namespace Foam { -// Forward declaration of friend functions and operators - +// Forward declaration of classes class equation; class equationOperation; +// Forward declaration of friend functions and operators // *** Located in equationReaderIO.C *** + class equationReader; + Istream& operator>>(Istream&, equationReader&); Ostream& operator<<(Ostream&, const equationReader&); + /*---------------------------------------------------------------------------*\ Class equationReader Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H index 20b19e59a..8afaa60b9 100644 --- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H +++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H @@ -50,7 +50,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators class faBoundaryMesh; +class faPatch; + +Ostream& operator<<(Ostream&, const faPatch&); + /*---------------------------------------------------------------------------*\ Class faPatch Declaration diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H index 36e184cc4..68d62af49 100644 --- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H +++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H @@ -80,8 +80,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class fvMesh; +// Forward declaration of friend functions and operators + +class porousZone; + +Ostream& operator<<(Ostream&, const porousZone&); + + /*---------------------------------------------------------------------------*\ Class porousZone Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/algorithms/octree/octree/octreeDataPoint.H b/src/foam/algorithms/octree/octree/octreeDataPoint.H index d6abf0209..38edb9d7d 100644 --- a/src/foam/algorithms/octree/octree/octreeDataPoint.H +++ b/src/foam/algorithms/octree/octree/octreeDataPoint.H @@ -51,8 +51,16 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators template class octree; +// Forward declaration of friend functions and operators + +class octreeDataPoint; + +Ostream& operator<<(Ostream&, const octreeDataPoint&); + + /*---------------------------------------------------------------------------*\ Class octreeDataPoint Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/algorithms/octree/octree/treeBoundBox.H b/src/foam/algorithms/octree/octree/treeBoundBox.H index 84794793d..6ce9e197f 100644 --- a/src/foam/algorithms/octree/octree/treeBoundBox.H +++ b/src/foam/algorithms/octree/octree/treeBoundBox.H @@ -66,8 +66,20 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Random; +// Forward declaration of friend functions and operators + +class treeBoundBox; + +bool operator==(const treeBoundBox&, const treeBoundBox&); +bool operator!=(const treeBoundBox&, const treeBoundBox&); + +Istream& operator>>(Istream& is, treeBoundBox&); +Ostream& operator<<(Ostream& os, const treeBoundBox&); + + /*---------------------------------------------------------------------------*\ Class treeBoundBox Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/algorithms/octree/octree/treeLeaf.H b/src/foam/algorithms/octree/octree/treeLeaf.H index 4eb474d31..285dae8f5 100644 --- a/src/foam/algorithms/octree/octree/treeLeaf.H +++ b/src/foam/algorithms/octree/octree/treeLeaf.H @@ -50,14 +50,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class treeBoundBox; class Ostream; template class octree; -template class treeLeaf; // Forward declaration of friend functions and operators +template class treeLeaf; + template Istream& operator>>(Istream&, treeLeaf&); template Ostream& operator<<(Ostream&, const treeLeaf&); diff --git a/src/foam/algorithms/octree/octree/treeNode.H b/src/foam/algorithms/octree/octree/treeNode.H index 73338497b..295a21c86 100644 --- a/src/foam/algorithms/octree/octree/treeNode.H +++ b/src/foam/algorithms/octree/octree/treeNode.H @@ -58,13 +58,14 @@ namespace Foam { // class intersection; - template class octree; template class treeLeaf; -template class treeNode; + // Forward declaration of friend functions and operators +template class treeNode; + template Istream& operator>>(Istream&, treeNode&); template Ostream& operator<<(Ostream&, const treeNode&); diff --git a/src/foam/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/foam/containers/HashTables/HashPtrTable/HashPtrTable.H index 14c5bae88..ecfaa3edd 100644 --- a/src/foam/containers/HashTables/HashPtrTable/HashPtrTable.H +++ b/src/foam/containers/HashTables/HashPtrTable/HashPtrTable.H @@ -43,6 +43,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; diff --git a/src/foam/containers/HashTables/HashTable/HashTable.H b/src/foam/containers/HashTables/HashTable/HashTable.H index 43967edde..05d9f1c96 100644 --- a/src/foam/containers/HashTables/HashTable/HashTable.H +++ b/src/foam/containers/HashTables/HashTable/HashTable.H @@ -55,10 +55,12 @@ SourceFiles namespace Foam { -// Forward declaration of friend functions and operators - +// Forward declaration of classes template class List; template class UList; + +// Forward declaration of friend functions and operators + template class HashTable; template class HashPtrTable; diff --git a/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H index 1f1f166f6..f23bd413b 100644 --- a/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H +++ b/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H @@ -53,9 +53,11 @@ SourceFiles namespace Foam { +// Forward declaration of classes +template class List; + // Forward declaration of friend functions and operators -template class List; template class StaticHashTable; template Istream& operator>> diff --git a/src/foam/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/foam/containers/LinkedLists/accessTypes/ILList/ILList.H index 1cdb76dbc..f17cf99d5 100644 --- a/src/foam/containers/LinkedLists/accessTypes/ILList/ILList.H +++ b/src/foam/containers/LinkedLists/accessTypes/ILList/ILList.H @@ -43,6 +43,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; diff --git a/src/foam/containers/LinkedLists/accessTypes/LList/LList.H b/src/foam/containers/LinkedLists/accessTypes/LList/LList.H index 785a025c3..a8ae51865 100644 --- a/src/foam/containers/LinkedLists/accessTypes/LList/LList.H +++ b/src/foam/containers/LinkedLists/accessTypes/LList/LList.H @@ -44,6 +44,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; diff --git a/src/foam/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/foam/containers/LinkedLists/accessTypes/UILList/UILList.H index 1beef3930..7fc266980 100644 --- a/src/foam/containers/LinkedLists/accessTypes/UILList/UILList.H +++ b/src/foam/containers/LinkedLists/accessTypes/UILList/UILList.H @@ -44,6 +44,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Ostream; // Forward declaration of friend functions and operators diff --git a/src/foam/containers/Lists/FixedList/FixedList.H b/src/foam/containers/Lists/FixedList/FixedList.H index 062e906a3..5948d71dd 100644 --- a/src/foam/containers/Lists/FixedList/FixedList.H +++ b/src/foam/containers/Lists/FixedList/FixedList.H @@ -49,6 +49,11 @@ SourceFiles namespace Foam { +// Forward declaration of classes +template class UList; +template class SLList; + + // Forward declaration of friend functions and operators template class FixedList; @@ -59,9 +64,6 @@ Istream& operator>>(Istream&, FixedList&); template Ostream& operator<<(Ostream&, const FixedList&); -template class UList; -template class SLList; - /*---------------------------------------------------------------------------*\ Class FixedList Declaration diff --git a/src/foam/coordinateSystems/coordinateSystem.H b/src/foam/coordinateSystems/coordinateSystem.H index a6f603f21..d60a8ecf8 100644 --- a/src/foam/coordinateSystems/coordinateSystem.H +++ b/src/foam/coordinateSystems/coordinateSystem.H @@ -143,9 +143,17 @@ SourceFiles namespace Foam { -// Forward declaration of friend functions and operators +// Forward declaration of classes class boundBox; +// Forward declaration of friend functions and operators + +class coordinateSystem; + +bool operator!=(const coordinateSystem&, const coordinateSystem&); +Ostream& operator<<(Ostream&, const coordinateSystem&); + + /*---------------------------------------------------------------------------*\ Class coordinateSystem Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/db/IOobjects/CompactIOList/CompactIOList.H b/src/foam/db/IOobjects/CompactIOList/CompactIOList.H index 078cf0a24..12efc93c7 100644 --- a/src/foam/db/IOobjects/CompactIOList/CompactIOList.H +++ b/src/foam/db/IOobjects/CompactIOList/CompactIOList.H @@ -47,10 +47,12 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; // Forward declaration of friend functions and operators + template class CompactIOList; template Istream& operator>> @@ -64,6 +66,7 @@ template Ostream& operator<< const CompactIOList& ); + /*---------------------------------------------------------------------------*\ Class CompactIOList Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/db/dictionary/dictionary.H b/src/foam/db/dictionary/dictionary.H index 2a0b01da7..a8f47d09d 100644 --- a/src/foam/db/dictionary/dictionary.H +++ b/src/foam/db/dictionary/dictionary.H @@ -65,14 +65,18 @@ SourceFiles namespace Foam { -// Forward declaration of friend functions and operators +// Forward declaration of classes class regExp; -class dictionary; class SHA1Digest; +// Forward declaration of friend functions and operators + +class dictionary; + Istream& operator>>(Istream&, dictionary&); Ostream& operator<<(Ostream&, const dictionary&); + /*---------------------------------------------------------------------------*\ Class dictionaryName Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H index 4a3fad529..e1627529d 100644 --- a/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H +++ b/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H @@ -51,6 +51,11 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class dictionaryEntry; +Ostream& operator<<(Ostream&, const dictionaryEntry&); + + /*---------------------------------------------------------------------------*\ Class dictionaryEntry Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H b/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H index 50421ff6f..e9e0221e4 100644 --- a/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H +++ b/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H @@ -45,6 +45,9 @@ SourceFiles namespace Foam { +// Forward declaration of classes +class dictionary; + // Forward declaration of friend functions and operators template class dimensioned; @@ -55,7 +58,6 @@ Istream& operator>>(Istream&, dimensioned&); template Ostream& operator<<(Ostream&, const dimensioned&); -class dictionary; /*---------------------------------------------------------------------------*\ Class dimensioned Declaration diff --git a/src/foam/fields/CoeffField/diagTensorCoeffField.H b/src/foam/fields/CoeffField/diagTensorCoeffField.H index d58d8713b..2dc4c86ef 100644 --- a/src/foam/fields/CoeffField/diagTensorCoeffField.H +++ b/src/foam/fields/CoeffField/diagTensorCoeffField.H @@ -47,6 +47,17 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators + +Ostream& operator<<(Ostream&, const CoeffField&); + +Ostream& operator<<(Ostream&, const tmp >&); + + +/*---------------------------------------------------------------------------*\ + Class symmTensor4thOrderCoeffField Declaration +\*---------------------------------------------------------------------------*/ + template<> class CoeffField : diff --git a/src/foam/fields/CoeffField/scalarCoeffField.H b/src/foam/fields/CoeffField/scalarCoeffField.H index 060b43994..2af74c71d 100644 --- a/src/foam/fields/CoeffField/scalarCoeffField.H +++ b/src/foam/fields/CoeffField/scalarCoeffField.H @@ -45,6 +45,17 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators + +Ostream& operator<<(Ostream&, const CoeffField&); + +Ostream& operator<<(Ostream&, const tmp >&); + + +/*---------------------------------------------------------------------------*\ + Class scalarCoeffField Declaration +\*---------------------------------------------------------------------------*/ + template<> class CoeffField : diff --git a/src/foam/fields/CoeffField/sphericalTensorCoeffField.H b/src/foam/fields/CoeffField/sphericalTensorCoeffField.H index 773fa89f0..f7db6c3c9 100644 --- a/src/foam/fields/CoeffField/sphericalTensorCoeffField.H +++ b/src/foam/fields/CoeffField/sphericalTensorCoeffField.H @@ -47,6 +47,17 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators + +Ostream& operator<<(Ostream&, const CoeffField&); + +Ostream& operator<<(Ostream&, const tmp >&); + + +/*---------------------------------------------------------------------------*\ + Class sphericalTensorCoeffField Declaration +\*---------------------------------------------------------------------------*/ + template<> class CoeffField : diff --git a/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H b/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H index 58ead4310..8247e4939 100644 --- a/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H +++ b/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H @@ -47,6 +47,17 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators + +Ostream& operator<<(Ostream&, const CoeffField&); + +Ostream& operator<<(Ostream&, const tmp >&); + + +/*---------------------------------------------------------------------------*\ + Class symmTensor4thOrderCoeffField Declaration +\*---------------------------------------------------------------------------*/ + template<> class CoeffField : diff --git a/src/foam/fields/CoeffField/symmTensorCoeffField.H b/src/foam/fields/CoeffField/symmTensorCoeffField.H index 79f97250c..bb6b369f9 100644 --- a/src/foam/fields/CoeffField/symmTensorCoeffField.H +++ b/src/foam/fields/CoeffField/symmTensorCoeffField.H @@ -47,6 +47,17 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators + +Ostream& operator<<(Ostream&, const CoeffField&); + +Ostream& operator<<(Ostream&, const tmp >&); + + +/*---------------------------------------------------------------------------*\ + Class symmTensorCoeffField Declaration +\*---------------------------------------------------------------------------*/ + template<> class CoeffField : diff --git a/src/foam/fields/CoeffField/tensorCoeffField.H b/src/foam/fields/CoeffField/tensorCoeffField.H index 6b837b826..03fa036d8 100644 --- a/src/foam/fields/CoeffField/tensorCoeffField.H +++ b/src/foam/fields/CoeffField/tensorCoeffField.H @@ -47,6 +47,17 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators + +Ostream& operator<<(Ostream&, const CoeffField&); + +Ostream& operator<<(Ostream&, const tmp >&); + + +/*---------------------------------------------------------------------------*\ + Class tensorCoeffField Declaration +\*---------------------------------------------------------------------------*/ + template<> class CoeffField : diff --git a/src/foam/fields/GeometricFields/GeometricField/GeometricField.H b/src/foam/fields/GeometricFields/GeometricField/GeometricField.H index 3f05f6419..17b4b7684 100644 --- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.H +++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.H @@ -51,6 +51,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class dictionary; // Forward declaration of friend functions and operators diff --git a/src/foam/matrices/LUscalarMatrix/procLduInterface.H b/src/foam/matrices/LUscalarMatrix/procLduInterface.H index 4edec793e..a47b2398f 100644 --- a/src/foam/matrices/LUscalarMatrix/procLduInterface.H +++ b/src/foam/matrices/LUscalarMatrix/procLduInterface.H @@ -43,8 +43,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class lduInterfaceField; +// Forward declaration of friend functions and operators + +class procLduInterface; + +Ostream& operator<<(Ostream&, const procLduInterface&); + + /*---------------------------------------------------------------------------*\ Class procLduInterface Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/matrices/LUscalarMatrix/procLduMatrix.H b/src/foam/matrices/LUscalarMatrix/procLduMatrix.H index 999e1262f..b39bc6a9b 100644 --- a/src/foam/matrices/LUscalarMatrix/procLduMatrix.H +++ b/src/foam/matrices/LUscalarMatrix/procLduMatrix.H @@ -45,6 +45,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class procLduInterface; class lduMatrix; diff --git a/src/foam/matrices/crMatrix/crAddressing.H b/src/foam/matrices/crMatrix/crAddressing.H index 1682a3521..d98a7a233 100644 --- a/src/foam/matrices/crMatrix/crAddressing.H +++ b/src/foam/matrices/crMatrix/crAddressing.H @@ -46,6 +46,11 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class crAddressing; +Ostream& operator<<(Ostream&, const crAddressing&); + + /*---------------------------------------------------------------------------*\ Class crAddressing Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/matrices/crMatrix/crMatrix.H b/src/foam/matrices/crMatrix/crMatrix.H index a377fc997..8056cd02f 100644 --- a/src/foam/matrices/crMatrix/crMatrix.H +++ b/src/foam/matrices/crMatrix/crMatrix.H @@ -46,6 +46,11 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class crMatrix; +Ostream& operator<<(Ostream&, const crMatrix&); + + /*---------------------------------------------------------------------------*\ Class crMatrix Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/meshes/boundBox/boundBox.H b/src/foam/meshes/boundBox/boundBox.H index c23256ede..4be618676 100644 --- a/src/foam/meshes/boundBox/boundBox.H +++ b/src/foam/meshes/boundBox/boundBox.H @@ -44,7 +44,8 @@ namespace Foam class boundBox; template class tmp; -Ostream& operator<<(Ostream& os, const boundBox& b); +Istream& operator>>(Istream& is, boundBox&); +Ostream& operator<<(Ostream& os, const boundBox&); /*---------------------------------------------------------------------------*\ diff --git a/src/foam/meshes/meshShapes/face/face.H b/src/foam/meshes/meshShapes/face/face.H index 854eb08ce..2dacef7e0 100644 --- a/src/foam/meshes/meshShapes/face/face.H +++ b/src/foam/meshes/meshShapes/face/face.H @@ -57,18 +57,21 @@ SourceFiles namespace Foam { -// Forward declaration of friend functions and operators - -class face; +// Forward declaration of classes class triFace; template class DynamicList; +// Forward declaration of friend functions and operators + +class face; + inline bool operator==(const face& a, const face& b); inline bool operator!=(const face& a, const face& b); inline Istream& operator>>(Istream&, face&); + /*---------------------------------------------------------------------------*\ Class face Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/meshes/meshShapes/triFace/triFace.H b/src/foam/meshes/meshShapes/triFace/triFace.H index b90c948d9..07cd7ba91 100644 --- a/src/foam/meshes/meshShapes/triFace/triFace.H +++ b/src/foam/meshes/meshShapes/triFace/triFace.H @@ -53,11 +53,13 @@ SourceFiles namespace Foam { +// Forward declaration of classes class face; // Forward declaration of friend functions and operators class triFace; + inline bool operator==(const triFace&, const triFace&); inline bool operator!=(const triFace&, const triFace&); diff --git a/src/foam/meshes/patchIdentifier/patchIdentifier.H b/src/foam/meshes/patchIdentifier/patchIdentifier.H index 27d878a69..9073b6ba0 100644 --- a/src/foam/meshes/patchIdentifier/patchIdentifier.H +++ b/src/foam/meshes/patchIdentifier/patchIdentifier.H @@ -43,11 +43,13 @@ SourceFiles namespace Foam { +// Forward declaration of classes class dictionary; // Forward declaration of friend functions and operators class patchIdentifier; + Ostream& operator<<(Ostream&, const patchIdentifier&); diff --git a/src/foam/meshes/polyMesh/zones/ZoneID/ZoneID.H b/src/foam/meshes/polyMesh/zones/ZoneID/ZoneID.H index 6b0147582..af3e74bac 100644 --- a/src/foam/meshes/polyMesh/zones/ZoneID/ZoneID.H +++ b/src/foam/meshes/polyMesh/zones/ZoneID/ZoneID.H @@ -44,6 +44,7 @@ Description namespace Foam { +// Forward declaration of classes template class ZoneMesh; // Forward declaration of friend functions and operators diff --git a/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H b/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H index 199e5c497..fa0abcfcf 100644 --- a/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H +++ b/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H @@ -53,11 +53,13 @@ SourceFiles namespace Foam { +// Forward declaration of classes class mapPolyMesh; // Forward declaration of friend functions and operators class faceZone; + Ostream& operator<<(Ostream&, const faceZone&); diff --git a/src/foam/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/foam/meshes/primitiveShapes/tetrahedron/tetrahedron.H index 7213381b3..9232f818a 100644 --- a/src/foam/meshes/primitiveShapes/tetrahedron/tetrahedron.H +++ b/src/foam/meshes/primitiveShapes/tetrahedron/tetrahedron.H @@ -48,6 +48,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; diff --git a/src/foam/meshes/primitiveShapes/triangle/triangle.H b/src/foam/meshes/primitiveShapes/triangle/triangle.H index 0b3e3ff67..947e72e7a 100644 --- a/src/foam/meshes/primitiveShapes/triangle/triangle.H +++ b/src/foam/meshes/primitiveShapes/triangle/triangle.H @@ -45,6 +45,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; diff --git a/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H b/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H index cefd63035..d7385e44a 100644 --- a/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H +++ b/src/foam/primitives/BlockCoeff/scalarBlockCoeff.H @@ -42,6 +42,11 @@ Author namespace Foam { +// Forward declaration of friend functions and operators + +Ostream& operator<<(Ostream&, const BlockCoeff&); + + /*---------------------------------------------------------------------------*\ Class BlockCoeff Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/foam/primitives/Lists/hashedWordList.H b/src/foam/primitives/Lists/hashedWordList.H index d06a05d9a..bac2c9881 100644 --- a/src/foam/primitives/Lists/hashedWordList.H +++ b/src/foam/primitives/Lists/hashedWordList.H @@ -44,9 +44,10 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators + class hashedWordList; -// Forward declaration of friend functions and operators Istream& operator>>(Istream&, hashedWordList&); Ostream& operator<<(Ostream&, const hashedWordList&); diff --git a/src/foam/primitives/bools/Switch/Switch.H b/src/foam/primitives/bools/Switch/Switch.H index a568f7a81..85b168ba3 100644 --- a/src/foam/primitives/bools/Switch/Switch.H +++ b/src/foam/primitives/bools/Switch/Switch.H @@ -45,10 +45,12 @@ SourceFiles namespace Foam { +// Forward declaration of classes +class dictionary; + // Forward declaration of friend functions and operators class Switch; -class dictionary; Istream& operator>>(Istream&, Switch&); Ostream& operator<<(Ostream&, const Switch&); diff --git a/src/foam/primitives/strings/fileName/fileName.H b/src/foam/primitives/strings/fileName/fileName.H index 1644f8734..a75347991 100644 --- a/src/foam/primitives/strings/fileName/fileName.H +++ b/src/foam/primitives/strings/fileName/fileName.H @@ -53,6 +53,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes template class List; typedef List wordList; diff --git a/src/foam/primitives/strings/keyType/keyType.H b/src/foam/primitives/strings/keyType/keyType.H index 3e7defe4e..af150d609 100644 --- a/src/foam/primitives/strings/keyType/keyType.H +++ b/src/foam/primitives/strings/keyType/keyType.H @@ -49,6 +49,11 @@ namespace Foam class Istream; class Ostream; +// Forward declaration of friend functions and operators +class keyType; +Istream& operator>>(Istream&, keyType&); +Ostream& operator<<(Ostream&, const keyType&); + /*---------------------------------------------------------------------------*\ Class keyType Declaration diff --git a/src/foam/primitives/strings/wordRe/wordRe.H b/src/foam/primitives/strings/wordRe/wordRe.H index bba4afc26..88be01a9e 100644 --- a/src/foam/primitives/strings/wordRe/wordRe.H +++ b/src/foam/primitives/strings/wordRe/wordRe.H @@ -59,11 +59,14 @@ SourceFiles namespace Foam { -// Forward declaration of friend functions and operators -class wordRe; +// Forward declaration of classes class Istream; class Ostream; +// Forward declaration of friend functions and operators + +class wordRe; + Istream& operator>>(Istream&, wordRe&); Ostream& operator<<(Ostream&, const wordRe&); diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H index fa94334b1..0c7e0fef3 100644 --- a/src/lagrangian/basic/Particle/Particle.H +++ b/src/lagrangian/basic/Particle/Particle.H @@ -44,6 +44,7 @@ Description namespace Foam { +// Forward declaration of classes template class Cloud; diff --git a/src/lagrangian/dieselSpray/parcel/parcel.H b/src/lagrangian/dieselSpray/parcel/parcel.H index 24f035c07..309f6ce2a 100644 --- a/src/lagrangian/dieselSpray/parcel/parcel.H +++ b/src/lagrangian/dieselSpray/parcel/parcel.H @@ -40,8 +40,16 @@ Description namespace Foam { +// Forward declaration of classes class spray; +// Forward declaration of friend functions and operators + +class parcel; + +Ostream& operator<<(Ostream&, const parcel&); + + /*---------------------------------------------------------------------------*\ Class parcel Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H index db83c51a1..b0e0c6a3b 100644 --- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H +++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H @@ -46,6 +46,13 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class phaseProperties; + +Istream& operator>>(Istream&, phaseProperties&); +Ostream& operator<<(Ostream&, const phaseProperties&); + + /*---------------------------------------------------------------------------*\ Class phaseProperties Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H index b077d8dd9..8f5a360ac 100644 --- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H +++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H @@ -43,6 +43,13 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class receivingReferralList; + +Istream& operator>>(Istream&, receivingReferralList&); +Ostream& operator<<(Ostream&, const receivingReferralList&); + + /*---------------------------------------------------------------------------*\ Class receivingReferralList Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H index d7315eb8b..9de42a022 100644 --- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H +++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H @@ -43,6 +43,13 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class sendingReferralList; + +Istream& operator>>(Istream&, sendingReferralList&); +Ostream& operator<<(Ostream&, const sendingReferralList&); + + /*---------------------------------------------------------------------------*\ Class sendingReferralList Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H index a3ee23462..ba5d39af8 100644 --- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H +++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H @@ -43,6 +43,16 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class referredMolecule; + +inline bool operator==(const referredMolecule& a, const referredMolecule& b); +inline bool operator!=(const referredMolecule& a, const referredMolecule& b); + +Istream& operator>>(Istream&, referredMolecule&); +Ostream& operator<<(Ostream&, const referredMolecule&); + + /*---------------------------------------------------------------------------*\ Class referredMolecule Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H index f68ec313f..9fb06a631 100644 --- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H +++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H @@ -47,8 +47,12 @@ SourceFiles namespace Foam { -// Class forward declarations +// Forward declaration of friend functions and operators class moleculeCloud; +class molecule; + +Ostream& operator<<(Ostream&, const molecule&); + /*---------------------------------------------------------------------------*\ Class molecule Declaration diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H index 1e4f36f0e..4e5ec6a45 100644 --- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H +++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H @@ -44,6 +44,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class reducedUnits; + +Ostream& operator<<(Ostream&, const reducedUnits&); + + /*---------------------------------------------------------------------------*\ Class reducedUnits Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/lagrangian/solidParticle/solidParticle.H b/src/lagrangian/solidParticle/solidParticle.H index 0331cf3f1..945c67d70 100644 --- a/src/lagrangian/solidParticle/solidParticle.H +++ b/src/lagrangian/solidParticle/solidParticle.H @@ -49,7 +49,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators class solidParticleCloud; +class solidParticle; + +Ostream& operator<<(Ostream&, const solidParticle&); + /*---------------------------------------------------------------------------*\ Class solidParticle Declaration diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H index 54283f2f4..077e41d92 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H @@ -49,10 +49,18 @@ SourceFiles namespace Foam { -// Class forward declarations +// Forward declaration of classes class polyPatch; class polyMesh; +// Forward declaration of friend functions and operators + +class pointData; + +Ostream& operator<<(Ostream&, const pointData&); +Istream& operator>>(Istream&, pointData&); + + /*---------------------------------------------------------------------------*\ Class pointData Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H index 1bb359827..c415b1e3c 100644 --- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H +++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H @@ -40,6 +40,7 @@ Description namespace Foam { +// Forward declaration of classes template class Cloud; diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H index 67402983e..5da3b61bc 100644 --- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H +++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H @@ -45,8 +45,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class trackedParticleCloud; +// Forward declaration of friend functions and operators + +class trackedParticle; + +Ostream& operator<<(Ostream&, const trackedParticle&); + + /*---------------------------------------------------------------------------*\ Class trackedParticle Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/mesh/blockMesh/block/block.H b/src/mesh/blockMesh/block/block.H index 1a9564b99..ae9cce304 100644 --- a/src/mesh/blockMesh/block/block.H +++ b/src/mesh/blockMesh/block/block.H @@ -50,13 +50,17 @@ SourceFiles namespace Foam { +// Forward declaration of class class Istream; class Ostream; // Forward declaration of friend functions and operators + class block; + Ostream& operator<<(Ostream&, const block&); + /*---------------------------------------------------------------------------*\ Class block Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H index 1fe113120..2535d8266 100644 --- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H +++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H @@ -47,14 +47,17 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; // Forward declaration of friend functions and operators class blockMesh; class blockDescriptor; + Ostream& operator<<(Ostream&, const blockDescriptor&); + /*---------------------------------------------------------------------------*\ Class blockDescriptor Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdge.H b/src/mesh/blockMesh/curvedEdges/curvedEdge.H index 4f3294d52..cca97ef81 100644 --- a/src/mesh/blockMesh/curvedEdges/curvedEdge.H +++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.H @@ -47,6 +47,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class curvedEdge; + +Ostream& operator<<(Ostream&, const curvedEdge&); + + /*---------------------------------------------------------------------------*\ Class curvedEdge Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.H b/src/meshTools/PointEdgeWave/pointEdgePoint.H index ca9d8fb05..a9ef9455e 100644 --- a/src/meshTools/PointEdgeWave/pointEdgePoint.H +++ b/src/meshTools/PointEdgeWave/pointEdgePoint.H @@ -54,6 +54,14 @@ namespace Foam class polyPatch; class polyMesh; +// Forward declaration of friend functions and operators + +class pointEdgePoint; + +Ostream& operator<<(Ostream&, const pointEdgePoint&); +Istream& operator>>(Istream&, pointEdgePoint&); + + /*---------------------------------------------------------------------------*\ Class pointEdgePoint Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/meshTools/cellClassification/cellInfo.H b/src/meshTools/cellClassification/cellInfo.H index 67d0f56fc..88c653957 100644 --- a/src/meshTools/cellClassification/cellInfo.H +++ b/src/meshTools/cellClassification/cellInfo.H @@ -45,9 +45,19 @@ SourceFiles namespace Foam { + +// Forward declaration of classes class polyPatch; class polyMesh; +// Forward declaration of friend functions and operators + +class cellInfo; + +Ostream& operator<<(Ostream&, const cellInfo&); +Istream& operator>>(Istream&, cellInfo&); + + /*---------------------------------------------------------------------------*\ Class cellInfo Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.H b/src/meshTools/cellDist/wallPoint/wallPoint.H index dcdabd890..e8c76ad9c 100644 --- a/src/meshTools/cellDist/wallPoint/wallPoint.H +++ b/src/meshTools/cellDist/wallPoint/wallPoint.H @@ -50,9 +50,11 @@ namespace Foam // Forward declaration of classes class polyPatch; class polyMesh; -class wallPoint; // Forward declaration of friend functions and operators + +class wallPoint; + Ostream& operator<<(Ostream&, const wallPoint&); Istream& operator>>(Istream&, wallPoint&); diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.H b/src/meshTools/cellDist/wallPoint/wallPointData.H index f29286570..991c9cf7b 100644 --- a/src/meshTools/cellDist/wallPoint/wallPointData.H +++ b/src/meshTools/cellDist/wallPoint/wallPointData.H @@ -46,6 +46,7 @@ SourceFiles namespace Foam { +// Forward declaration of classes template class wallPointData; // Forward declaration of friend functions and operators diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H index f3995c90d..b40e4795e 100644 --- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H +++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H @@ -55,6 +55,14 @@ namespace Foam // Forward declaration of classes class triSurface; +// Forward declaration of friend functions and operators +class surfaceLocation; + +Istream& operator>>(Istream& is, surfaceLocation& sl); +Ostream& operator<<(Ostream& os, const surfaceLocation& sl); +Ostream& operator<<(Ostream&, const InfoProxy&); + + /*---------------------------------------------------------------------------*\ Class surfaceLocation Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangle.H b/src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangle.H index 09a341369..002c227ae 100644 --- a/src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangle.H +++ b/src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangle.H @@ -42,6 +42,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class STLtriangle; + +inline Ostream& operator<<(Ostream&, const STLtriangle&); + + /*---------------------------------------------------------------------------*\ Class STLtriangle Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.H b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.H index 48799b05a..53eaac03c 100644 --- a/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.H +++ b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.H @@ -45,6 +45,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class surfacePatch; + +Ostream& operator<<(Ostream&, const surfacePatch&); + + /*---------------------------------------------------------------------------*\ Class surfacePatch Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.H b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.H index 6b153d21d..f31cc93ce 100644 --- a/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.H +++ b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.H @@ -46,6 +46,10 @@ namespace Foam { // Forward declaration of classes +// Forward declaration of friend functions and operators +class surfacePatchIOList; + +Ostream& operator<<(Ostream&, const surfacePatchIOList&); /*---------------------------------------------------------------------------*\ Class surfacePatchIOList Declaration diff --git a/src/meshTools/triSurface/triSurface/triSurface.H b/src/meshTools/triSurface/triSurface/triSurface.H index 7d3a9cf73..eac31a00c 100644 --- a/src/meshTools/triSurface/triSurface/triSurface.H +++ b/src/meshTools/triSurface/triSurface/triSurface.H @@ -48,9 +48,17 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Time; class IFstream; +// Forward declaration of friend functions and operators + +class triSurface; + +Ostream& operator<<(Ostream&, const triSurface&); + + /*---------------------------------------------------------------------------*\ Class triSurface Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H index bafbee892..66c0d934a 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H @@ -68,6 +68,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class sampledSurface; + +Ostream& operator<<(Ostream&, const sampledSurface&); + + /*---------------------------------------------------------------------------*\ Class sampledSurface Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H index e66008ca5..2de1e0571 100644 --- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H +++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H @@ -45,7 +45,11 @@ SourceFiles namespace Foam { -// Forward declaration of classes +// Forward declaration of friend functions and operators +class surfZoneIOList; + +Ostream& operator<<(Ostream&, const surfZoneIOList&); + /*---------------------------------------------------------------------------*\ Class surfZoneIOList Declaration diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H index 0ee086ece..036b6ef36 100644 --- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H +++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H @@ -47,13 +47,16 @@ SourceFiles namespace Foam { +// Forward declaration of classes class dictionary; // Forward declaration of friend functions and operators class surfZoneIdentifier; + Ostream& operator<<(Ostream&, const surfZoneIdentifier&); + /*---------------------------------------------------------------------------*\ Class surfZoneIdentifier Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/surfMesh/surfaceFormats/stl/STLtriangle.H b/src/surfMesh/surfaceFormats/stl/STLtriangle.H index bf4f8f9b1..aef7de706 100644 --- a/src/surfMesh/surfaceFormats/stl/STLtriangle.H +++ b/src/surfMesh/surfaceFormats/stl/STLtriangle.H @@ -44,6 +44,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class STLtriangle; + +Ostream& operator<<(Ostream&, const STLtriangle&); + + /*---------------------------------------------------------------------------*\ Class STLtriangle Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwong.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwong.H index 526cfb036..1b36140c5 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwong.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/aungierRedlichKwong/aungierRedlichKwong.H @@ -55,6 +55,12 @@ Germany namespace Foam { +// Forward declaration of friend functions and operators +class aungierRedlichKwong; + +Ostream& operator<<(Ostream&, const aungierRedlichKwong&); + + /*---------------------------------------------------------------------------*\ Class aungierRedlichKwong Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H index fe43dbb2d..711c223b2 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H @@ -57,6 +57,12 @@ Germany namespace Foam { +// Forward declaration of friend functions and operators +class pengRobinson; + +Ostream& operator<<(Ostream&, const pengRobinson&); + + /*---------------------------------------------------------------------------*\ Class Peng Robinson Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H index 826e70161..b5ab2ccbc 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H @@ -50,6 +50,12 @@ Germany namespace Foam { +// Forward declaration of friend functions and operators +class redlichKwong; + +Ostream& operator<<(Ostream&, const redlichKwong&); + + /*---------------------------------------------------------------------------*\ Class redlichKwong Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H index 81d487902..c19a471a8 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H @@ -55,6 +55,12 @@ Germany namespace Foam { +// Forward declaration of friend functions and operators +class soaveRedlichKwong; + +Ostream& operator<<(Ostream&, const soaveRedlichKwong&); + + /*---------------------------------------------------------------------------*\ Class Soave Readlich Kwong Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H index b070825b8..01bcbe225 100644 --- a/src/thermophysicalModels/specie/specie/specie.H +++ b/src/thermophysicalModels/specie/specie/specie.H @@ -46,9 +46,17 @@ SourceFiles namespace Foam { +// Forward declaration of classes class Istream; class Ostream; +// Forward declaration of friend functions and operators + +class specie; + +Ostream& operator<<(Ostream&, const specie&); + + /*---------------------------------------------------------------------------*\ Class specie Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.H b/src/thermophysicalModels/specie/speciesTable/speciesTable.H index f3a7d0e4d..24d71ea6a 100644 --- a/src/thermophysicalModels/specie/speciesTable/speciesTable.H +++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.H @@ -44,6 +44,12 @@ SourceFiles namespace Foam { +// Forward declaration of friend functions and operators +class speciesTable; + +Istream& operator>>(Istream&, speciesTable&); + + /*---------------------------------------------------------------------------*\ Class speciesTable Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/decayingTurbulence/decayingVorton.H b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/decayingTurbulence/decayingVorton.H index f9f0325e7..3f90ec738 100644 --- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/decayingTurbulence/decayingVorton.H +++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/decayingTurbulence/decayingVorton.H @@ -49,6 +49,16 @@ Author namespace Foam { +// Forward declaration of friend functions and operators +class decayingVorton; + +bool operator==(const decayingVorton&, const decayingVorton&); +bool operator!=(const decayingVorton&, const decayingVorton&); + +Ostream& operator<<(Ostream& s, const decayingVorton& vt); +Istream& operator>>(Istream& s, decayingVorton& vt); + + /*---------------------------------------------------------------------------*\ Class decayingVorton Declaration \*---------------------------------------------------------------------------*/ From be47d0ece1876d913271efe15fcf64f769d1b299 Mon Sep 17 00:00:00 2001 From: Danial Khazaei Date: Fri, 15 Feb 2019 23:12:44 +0330 Subject: [PATCH 2/5] [format]: make forward declaration style consistent. --- .../rotationalConstraint/rotationalConstraint.H | 1 - .../translationalConstraint/translationalConstraint.H | 1 - .../combinedRestraints/combinedRestraint/combinedRestraint.H | 1 - .../rotationalRestraint/rotationalRestraint.H | 1 - .../translationalRestraint/translationalRestraint.H | 1 - src/OSspecific/POSIX/memInfo/memInfo.H | 2 +- .../meshCut/directions/directionInfo/directionInfo.H | 1 - .../directTopoChange/meshCut/refineCell/refineCell.H | 1 - .../meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H | 1 - .../polyMeshModifiers/polyMeshModifier/polyMeshModifier.H | 1 - .../polyTopoChange/polyTopoChanger/polyTopoChanger.H | 1 - src/dynamicMesh/dynamicMesh/refinementData/refinementData.H | 1 - .../dynamicMesh/refinementData/refinementDistanceData.H | 1 - src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H | 1 - src/equationReader/equationReader/equationReader.H | 1 - src/finiteVolume/cfdTools/general/porousMedia/porousZone.H | 1 - src/foam/algorithms/octree/octree/octreeDataPoint.H | 1 - src/foam/algorithms/octree/octree/treeBoundBox.H | 1 - src/foam/algorithms/octree/octree/treeLeaf.H | 1 - src/foam/algorithms/octree/octree/treeNode.H | 1 - src/foam/containers/HashTables/HashTable/HashTable.H | 1 - .../containers/HashTables/StaticHashTable/StaticHashTable.H | 1 - src/foam/containers/Lists/FixedList/FixedList.H | 1 - src/foam/coordinateSystems/coordinateSystem.H | 1 - src/foam/db/IOobjects/CompactIOList/CompactIOList.H | 1 - src/foam/db/dictionary/dictionary.H | 1 - src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H | 1 + src/foam/dimensionedTypes/dimensionedType/dimensionedType.H | 1 - src/foam/fields/CoeffField/diagTensorCoeffField.H | 1 - src/foam/fields/CoeffField/scalarCoeffField.H | 1 - src/foam/fields/CoeffField/sphericalTensorCoeffField.H | 1 - src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H | 1 - src/foam/fields/CoeffField/symmTensorCoeffField.H | 1 - src/foam/fields/CoeffField/tensorCoeffField.H | 1 - src/foam/matrices/LUscalarMatrix/procLduInterface.H | 1 - src/foam/matrices/crMatrix/crAddressing.H | 1 + src/foam/matrices/crMatrix/crMatrix.H | 1 + src/foam/meshes/boundBox/boundBox.H | 1 - src/foam/meshes/meshShapes/face/face.H | 1 - src/foam/meshes/meshShapes/triFace/triFace.H | 1 - src/foam/meshes/patchIdentifier/patchIdentifier.H | 1 - src/foam/meshes/polyMesh/zones/faceZone/faceZone.H | 1 - src/foam/primitives/Lists/hashedWordList.H | 1 - src/foam/primitives/bools/Switch/Switch.H | 1 - src/foam/primitives/strings/keyType/keyType.H | 1 + src/foam/primitives/strings/wordRe/wordRe.H | 1 - src/lagrangian/dieselSpray/parcel/parcel.H | 1 - .../autoHexMesh/autoHexMeshDriver/pointData/pointData.H | 1 - src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H | 1 - src/mesh/blockMesh/block/block.H | 1 - src/meshTools/PointEdgeWave/pointEdgePoint.H | 1 - src/meshTools/cellClassification/cellInfo.H | 1 - src/meshTools/cellDist/wallPoint/wallPoint.H | 1 - src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H | 1 - src/thermophysicalModels/specie/specie/specie.H | 1 - 55 files changed, 5 insertions(+), 51 deletions(-) diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H index d1209f755..72081fbd4 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H +++ b/src/ODE/sixDOF/sixDOFODE/constraints/rotationalConstraints/rotationalConstraint/rotationalConstraint.H @@ -76,7 +76,6 @@ namespace Foam class sixDOFODE; // Forward declaration of friend functions and operators - class rotationalConstraint; Ostream& operator<<(Ostream&, const rotationalConstraint&); diff --git a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H index 7d857e70d..f72760082 100644 --- a/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H +++ b/src/ODE/sixDOF/sixDOFODE/constraints/translationalConstraints/translationalConstraint/translationalConstraint.H @@ -76,7 +76,6 @@ namespace Foam class sixDOFODE; // Forward declaration of friend functions and operators - class translationalConstraint; Ostream& operator<<(Ostream&, const translationalConstraint&); diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H index 43d057288..45fce5fd8 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/combinedRestraints/combinedRestraint/combinedRestraint.H @@ -58,7 +58,6 @@ namespace Foam class sixDOFODE; // Forward declaration of friend functions and operators - class combinedRestraint; Ostream& operator<<(Ostream&, const combinedRestraint&); diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H index 9f82ca9a6..0ab11cd15 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/rotationalRestraints/rotationalRestraint/rotationalRestraint.H @@ -58,7 +58,6 @@ namespace Foam class sixDOFODE; // Forward declaration of friend functions and operators - class rotationalRestraint; Ostream& operator<<(Ostream&, const rotationalRestraint&); diff --git a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H index a0b0b8de6..32ae439b4 100644 --- a/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H +++ b/src/ODE/sixDOF/sixDOFODE/restraints/translationalRestraints/translationalRestraint/translationalRestraint.H @@ -58,7 +58,6 @@ namespace Foam class sixDOFODE; // Forward declaration of friend functions and operators - class translationalRestraint; Ostream& operator<<(Ostream&, const translationalRestraint&); diff --git a/src/OSspecific/POSIX/memInfo/memInfo.H b/src/OSspecific/POSIX/memInfo/memInfo.H index 4ecdf9930..4f7344491 100644 --- a/src/OSspecific/POSIX/memInfo/memInfo.H +++ b/src/OSspecific/POSIX/memInfo/memInfo.H @@ -52,12 +52,12 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators - class memInfo; Istream& operator>>(Istream&, memInfo&); Ostream& operator<<(Ostream&, const memInfo&); + /*---------------------------------------------------------------------------*\ Class memInfo Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H index 300d7d72e..1dd0df734 100644 --- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H +++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H @@ -72,7 +72,6 @@ class face; class polyMesh; // Forward declaration of friend functions and operators - class directionInfo; Ostream& operator<<(Ostream&, const directionInfo&); diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H index 62e55bec7..efc2574ab 100644 --- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H +++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/refineCell/refineCell.H @@ -48,7 +48,6 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators - class refineCell; Ostream& operator<<(Ostream&, const refineCell&); diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H index bb6b6b5fa..c55737a52 100644 --- a/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H +++ b/src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H @@ -52,7 +52,6 @@ class polyPatch; class polyMesh; // Forward declaration of friend functions and operators - class wallNormalInfo; Ostream& operator<<(Ostream&, const wallNormalInfo&); diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H index b1aacf437..480f0dcad 100644 --- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H +++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyMeshModifier/polyMeshModifier.H @@ -56,7 +56,6 @@ class polyTopoChange; class mapPolyMesh; // Forward declaration of friend functions and operators - class polyMeshModifier; Ostream& operator<<(Ostream&, const polyMeshModifier&); diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H index f9aac08ed..ba55603bd 100644 --- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H +++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H @@ -50,7 +50,6 @@ class mapPolyMesh; class polyBoundaryMesh; // Forward declaration of friend functions and operators - class polyTopoChanger; Ostream& operator<<(Ostream&, const polyTopoChanger&); diff --git a/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H b/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H index 3c3a5e196..ff34e916b 100644 --- a/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H +++ b/src/dynamicMesh/dynamicMesh/refinementData/refinementData.H @@ -50,7 +50,6 @@ class polyPatch; class polyMesh; // Forward declaration of friend functions and operators - class refinementData; Ostream& operator<<(Ostream&, const refinementData&); diff --git a/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H b/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H index a4024dd52..da2167396 100644 --- a/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H +++ b/src/dynamicMesh/dynamicMesh/refinementData/refinementDistanceData.H @@ -50,7 +50,6 @@ class polyPatch; class polyMesh; // Forward declaration of friend functions and operators - class refinementDistanceData; Ostream& operator<<(Ostream&, const refinementDistanceData&); diff --git a/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H b/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H index 1df11ef81..a1a25bb73 100644 --- a/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H +++ b/src/dynamicMesh/dynamicMesh/refinementData/refinementHistory.H @@ -90,7 +90,6 @@ class mapDistributePolyMesh; class polyMesh; // Forward declaration of friend functions and operators - class refinementHistory; Ostream& operator<<(Ostream&, const refinementHistory&); diff --git a/src/equationReader/equationReader/equationReader.H b/src/equationReader/equationReader/equationReader.H index 9b13409f2..926ca99e9 100644 --- a/src/equationReader/equationReader/equationReader.H +++ b/src/equationReader/equationReader/equationReader.H @@ -113,7 +113,6 @@ class equationOperation; // Forward declaration of friend functions and operators // *** Located in equationReaderIO.C *** - class equationReader; Istream& operator>>(Istream&, equationReader&); diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H index 68d62af49..a19520601 100644 --- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H +++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H @@ -84,7 +84,6 @@ namespace Foam class fvMesh; // Forward declaration of friend functions and operators - class porousZone; Ostream& operator<<(Ostream&, const porousZone&); diff --git a/src/foam/algorithms/octree/octree/octreeDataPoint.H b/src/foam/algorithms/octree/octree/octreeDataPoint.H index 38edb9d7d..bdf816acf 100644 --- a/src/foam/algorithms/octree/octree/octreeDataPoint.H +++ b/src/foam/algorithms/octree/octree/octreeDataPoint.H @@ -55,7 +55,6 @@ namespace Foam template class octree; // Forward declaration of friend functions and operators - class octreeDataPoint; Ostream& operator<<(Ostream&, const octreeDataPoint&); diff --git a/src/foam/algorithms/octree/octree/treeBoundBox.H b/src/foam/algorithms/octree/octree/treeBoundBox.H index 6ce9e197f..2ddc1a2e0 100644 --- a/src/foam/algorithms/octree/octree/treeBoundBox.H +++ b/src/foam/algorithms/octree/octree/treeBoundBox.H @@ -70,7 +70,6 @@ namespace Foam class Random; // Forward declaration of friend functions and operators - class treeBoundBox; bool operator==(const treeBoundBox&, const treeBoundBox&); diff --git a/src/foam/algorithms/octree/octree/treeLeaf.H b/src/foam/algorithms/octree/octree/treeLeaf.H index 285dae8f5..0eb2626b9 100644 --- a/src/foam/algorithms/octree/octree/treeLeaf.H +++ b/src/foam/algorithms/octree/octree/treeLeaf.H @@ -57,7 +57,6 @@ class Ostream; template class octree; // Forward declaration of friend functions and operators - template class treeLeaf; template Istream& operator>>(Istream&, treeLeaf&); diff --git a/src/foam/algorithms/octree/octree/treeNode.H b/src/foam/algorithms/octree/octree/treeNode.H index 295a21c86..17c6cde18 100644 --- a/src/foam/algorithms/octree/octree/treeNode.H +++ b/src/foam/algorithms/octree/octree/treeNode.H @@ -63,7 +63,6 @@ template class treeLeaf; // Forward declaration of friend functions and operators - template class treeNode; template Istream& operator>>(Istream&, treeNode&); diff --git a/src/foam/containers/HashTables/HashTable/HashTable.H b/src/foam/containers/HashTables/HashTable/HashTable.H index 05d9f1c96..6f864e8a3 100644 --- a/src/foam/containers/HashTables/HashTable/HashTable.H +++ b/src/foam/containers/HashTables/HashTable/HashTable.H @@ -60,7 +60,6 @@ template class List; template class UList; // Forward declaration of friend functions and operators - template class HashTable; template class HashPtrTable; diff --git a/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H index f23bd413b..ebb4f1c3f 100644 --- a/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H +++ b/src/foam/containers/HashTables/StaticHashTable/StaticHashTable.H @@ -57,7 +57,6 @@ namespace Foam template class List; // Forward declaration of friend functions and operators - template class StaticHashTable; template Istream& operator>> diff --git a/src/foam/containers/Lists/FixedList/FixedList.H b/src/foam/containers/Lists/FixedList/FixedList.H index 5948d71dd..edcc4a6fd 100644 --- a/src/foam/containers/Lists/FixedList/FixedList.H +++ b/src/foam/containers/Lists/FixedList/FixedList.H @@ -55,7 +55,6 @@ template class SLList; // Forward declaration of friend functions and operators - template class FixedList; template diff --git a/src/foam/coordinateSystems/coordinateSystem.H b/src/foam/coordinateSystems/coordinateSystem.H index d60a8ecf8..ea6c459be 100644 --- a/src/foam/coordinateSystems/coordinateSystem.H +++ b/src/foam/coordinateSystems/coordinateSystem.H @@ -147,7 +147,6 @@ namespace Foam class boundBox; // Forward declaration of friend functions and operators - class coordinateSystem; bool operator!=(const coordinateSystem&, const coordinateSystem&); diff --git a/src/foam/db/IOobjects/CompactIOList/CompactIOList.H b/src/foam/db/IOobjects/CompactIOList/CompactIOList.H index 12efc93c7..7077f8c49 100644 --- a/src/foam/db/IOobjects/CompactIOList/CompactIOList.H +++ b/src/foam/db/IOobjects/CompactIOList/CompactIOList.H @@ -52,7 +52,6 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators - template class CompactIOList; template Istream& operator>> diff --git a/src/foam/db/dictionary/dictionary.H b/src/foam/db/dictionary/dictionary.H index a8f47d09d..984f5fec0 100644 --- a/src/foam/db/dictionary/dictionary.H +++ b/src/foam/db/dictionary/dictionary.H @@ -70,7 +70,6 @@ class regExp; class SHA1Digest; // Forward declaration of friend functions and operators - class dictionary; Istream& operator>>(Istream&, dictionary&); diff --git a/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H index e1627529d..bd0e60df9 100644 --- a/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H +++ b/src/foam/db/dictionary/dictionaryEntry/dictionaryEntry.H @@ -53,6 +53,7 @@ namespace Foam // Forward declaration of friend functions and operators class dictionaryEntry; + Ostream& operator<<(Ostream&, const dictionaryEntry&); diff --git a/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H b/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H index e9e0221e4..d4d728981 100644 --- a/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H +++ b/src/foam/dimensionedTypes/dimensionedType/dimensionedType.H @@ -49,7 +49,6 @@ namespace Foam class dictionary; // Forward declaration of friend functions and operators - template class dimensioned; template diff --git a/src/foam/fields/CoeffField/diagTensorCoeffField.H b/src/foam/fields/CoeffField/diagTensorCoeffField.H index 2dc4c86ef..8e1189ce4 100644 --- a/src/foam/fields/CoeffField/diagTensorCoeffField.H +++ b/src/foam/fields/CoeffField/diagTensorCoeffField.H @@ -50,7 +50,6 @@ namespace Foam // Forward declaration of friend functions and operators Ostream& operator<<(Ostream&, const CoeffField&); - Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/scalarCoeffField.H b/src/foam/fields/CoeffField/scalarCoeffField.H index 2af74c71d..13357ec73 100644 --- a/src/foam/fields/CoeffField/scalarCoeffField.H +++ b/src/foam/fields/CoeffField/scalarCoeffField.H @@ -48,7 +48,6 @@ namespace Foam // Forward declaration of friend functions and operators Ostream& operator<<(Ostream&, const CoeffField&); - Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/sphericalTensorCoeffField.H b/src/foam/fields/CoeffField/sphericalTensorCoeffField.H index f7db6c3c9..fec8a0f73 100644 --- a/src/foam/fields/CoeffField/sphericalTensorCoeffField.H +++ b/src/foam/fields/CoeffField/sphericalTensorCoeffField.H @@ -50,7 +50,6 @@ namespace Foam // Forward declaration of friend functions and operators Ostream& operator<<(Ostream&, const CoeffField&); - Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H b/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H index 8247e4939..e7303216b 100644 --- a/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H +++ b/src/foam/fields/CoeffField/symmTensor4thOrderCoeffField.H @@ -50,7 +50,6 @@ namespace Foam // Forward declaration of friend functions and operators Ostream& operator<<(Ostream&, const CoeffField&); - Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/symmTensorCoeffField.H b/src/foam/fields/CoeffField/symmTensorCoeffField.H index bb6b369f9..4a424e246 100644 --- a/src/foam/fields/CoeffField/symmTensorCoeffField.H +++ b/src/foam/fields/CoeffField/symmTensorCoeffField.H @@ -50,7 +50,6 @@ namespace Foam // Forward declaration of friend functions and operators Ostream& operator<<(Ostream&, const CoeffField&); - Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/fields/CoeffField/tensorCoeffField.H b/src/foam/fields/CoeffField/tensorCoeffField.H index 03fa036d8..8fc9a7c84 100644 --- a/src/foam/fields/CoeffField/tensorCoeffField.H +++ b/src/foam/fields/CoeffField/tensorCoeffField.H @@ -50,7 +50,6 @@ namespace Foam // Forward declaration of friend functions and operators Ostream& operator<<(Ostream&, const CoeffField&); - Ostream& operator<<(Ostream&, const tmp >&); diff --git a/src/foam/matrices/LUscalarMatrix/procLduInterface.H b/src/foam/matrices/LUscalarMatrix/procLduInterface.H index a47b2398f..d5470eae7 100644 --- a/src/foam/matrices/LUscalarMatrix/procLduInterface.H +++ b/src/foam/matrices/LUscalarMatrix/procLduInterface.H @@ -47,7 +47,6 @@ namespace Foam class lduInterfaceField; // Forward declaration of friend functions and operators - class procLduInterface; Ostream& operator<<(Ostream&, const procLduInterface&); diff --git a/src/foam/matrices/crMatrix/crAddressing.H b/src/foam/matrices/crMatrix/crAddressing.H index d98a7a233..605a22f5d 100644 --- a/src/foam/matrices/crMatrix/crAddressing.H +++ b/src/foam/matrices/crMatrix/crAddressing.H @@ -48,6 +48,7 @@ namespace Foam // Forward declaration of friend functions and operators class crAddressing; + Ostream& operator<<(Ostream&, const crAddressing&); diff --git a/src/foam/matrices/crMatrix/crMatrix.H b/src/foam/matrices/crMatrix/crMatrix.H index 8056cd02f..5a5ba50a3 100644 --- a/src/foam/matrices/crMatrix/crMatrix.H +++ b/src/foam/matrices/crMatrix/crMatrix.H @@ -48,6 +48,7 @@ namespace Foam // Forward declaration of friend functions and operators class crMatrix; + Ostream& operator<<(Ostream&, const crMatrix&); diff --git a/src/foam/meshes/boundBox/boundBox.H b/src/foam/meshes/boundBox/boundBox.H index 4be618676..8d2742abb 100644 --- a/src/foam/meshes/boundBox/boundBox.H +++ b/src/foam/meshes/boundBox/boundBox.H @@ -40,7 +40,6 @@ namespace Foam { // Forward declaration of friend functions and operators - class boundBox; template class tmp; diff --git a/src/foam/meshes/meshShapes/face/face.H b/src/foam/meshes/meshShapes/face/face.H index 2dacef7e0..b38a6dd6a 100644 --- a/src/foam/meshes/meshShapes/face/face.H +++ b/src/foam/meshes/meshShapes/face/face.H @@ -64,7 +64,6 @@ template class DynamicList; // Forward declaration of friend functions and operators - class face; inline bool operator==(const face& a, const face& b); diff --git a/src/foam/meshes/meshShapes/triFace/triFace.H b/src/foam/meshes/meshShapes/triFace/triFace.H index 07cd7ba91..f9b73755f 100644 --- a/src/foam/meshes/meshShapes/triFace/triFace.H +++ b/src/foam/meshes/meshShapes/triFace/triFace.H @@ -57,7 +57,6 @@ namespace Foam class face; // Forward declaration of friend functions and operators - class triFace; inline bool operator==(const triFace&, const triFace&); diff --git a/src/foam/meshes/patchIdentifier/patchIdentifier.H b/src/foam/meshes/patchIdentifier/patchIdentifier.H index 9073b6ba0..674a75e9e 100644 --- a/src/foam/meshes/patchIdentifier/patchIdentifier.H +++ b/src/foam/meshes/patchIdentifier/patchIdentifier.H @@ -47,7 +47,6 @@ namespace Foam class dictionary; // Forward declaration of friend functions and operators - class patchIdentifier; Ostream& operator<<(Ostream&, const patchIdentifier&); diff --git a/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H b/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H index fa0abcfcf..822a1e9d8 100644 --- a/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H +++ b/src/foam/meshes/polyMesh/zones/faceZone/faceZone.H @@ -57,7 +57,6 @@ namespace Foam class mapPolyMesh; // Forward declaration of friend functions and operators - class faceZone; Ostream& operator<<(Ostream&, const faceZone&); diff --git a/src/foam/primitives/Lists/hashedWordList.H b/src/foam/primitives/Lists/hashedWordList.H index bac2c9881..3a1e38c6e 100644 --- a/src/foam/primitives/Lists/hashedWordList.H +++ b/src/foam/primitives/Lists/hashedWordList.H @@ -45,7 +45,6 @@ namespace Foam { // Forward declaration of friend functions and operators - class hashedWordList; Istream& operator>>(Istream&, hashedWordList&); diff --git a/src/foam/primitives/bools/Switch/Switch.H b/src/foam/primitives/bools/Switch/Switch.H index 85b168ba3..6ee713940 100644 --- a/src/foam/primitives/bools/Switch/Switch.H +++ b/src/foam/primitives/bools/Switch/Switch.H @@ -49,7 +49,6 @@ namespace Foam class dictionary; // Forward declaration of friend functions and operators - class Switch; Istream& operator>>(Istream&, Switch&); diff --git a/src/foam/primitives/strings/keyType/keyType.H b/src/foam/primitives/strings/keyType/keyType.H index af150d609..32a3b52ab 100644 --- a/src/foam/primitives/strings/keyType/keyType.H +++ b/src/foam/primitives/strings/keyType/keyType.H @@ -51,6 +51,7 @@ class Ostream; // Forward declaration of friend functions and operators class keyType; + Istream& operator>>(Istream&, keyType&); Ostream& operator<<(Ostream&, const keyType&); diff --git a/src/foam/primitives/strings/wordRe/wordRe.H b/src/foam/primitives/strings/wordRe/wordRe.H index 88be01a9e..7774d631c 100644 --- a/src/foam/primitives/strings/wordRe/wordRe.H +++ b/src/foam/primitives/strings/wordRe/wordRe.H @@ -64,7 +64,6 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators - class wordRe; Istream& operator>>(Istream&, wordRe&); diff --git a/src/lagrangian/dieselSpray/parcel/parcel.H b/src/lagrangian/dieselSpray/parcel/parcel.H index 309f6ce2a..65def467c 100644 --- a/src/lagrangian/dieselSpray/parcel/parcel.H +++ b/src/lagrangian/dieselSpray/parcel/parcel.H @@ -44,7 +44,6 @@ namespace Foam class spray; // Forward declaration of friend functions and operators - class parcel; Ostream& operator<<(Ostream&, const parcel&); diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H index 077e41d92..14d54abb3 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H @@ -54,7 +54,6 @@ class polyPatch; class polyMesh; // Forward declaration of friend functions and operators - class pointData; Ostream& operator<<(Ostream&, const pointData&); diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H index 5da3b61bc..13a1fd4cc 100644 --- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H +++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H @@ -49,7 +49,6 @@ namespace Foam class trackedParticleCloud; // Forward declaration of friend functions and operators - class trackedParticle; Ostream& operator<<(Ostream&, const trackedParticle&); diff --git a/src/mesh/blockMesh/block/block.H b/src/mesh/blockMesh/block/block.H index ae9cce304..4ca927882 100644 --- a/src/mesh/blockMesh/block/block.H +++ b/src/mesh/blockMesh/block/block.H @@ -55,7 +55,6 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators - class block; Ostream& operator<<(Ostream&, const block&); diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.H b/src/meshTools/PointEdgeWave/pointEdgePoint.H index a9ef9455e..e5959474d 100644 --- a/src/meshTools/PointEdgeWave/pointEdgePoint.H +++ b/src/meshTools/PointEdgeWave/pointEdgePoint.H @@ -55,7 +55,6 @@ class polyPatch; class polyMesh; // Forward declaration of friend functions and operators - class pointEdgePoint; Ostream& operator<<(Ostream&, const pointEdgePoint&); diff --git a/src/meshTools/cellClassification/cellInfo.H b/src/meshTools/cellClassification/cellInfo.H index 88c653957..1d7ac6b1f 100644 --- a/src/meshTools/cellClassification/cellInfo.H +++ b/src/meshTools/cellClassification/cellInfo.H @@ -51,7 +51,6 @@ class polyPatch; class polyMesh; // Forward declaration of friend functions and operators - class cellInfo; Ostream& operator<<(Ostream&, const cellInfo&); diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.H b/src/meshTools/cellDist/wallPoint/wallPoint.H index e8c76ad9c..a86df4809 100644 --- a/src/meshTools/cellDist/wallPoint/wallPoint.H +++ b/src/meshTools/cellDist/wallPoint/wallPoint.H @@ -52,7 +52,6 @@ class polyPatch; class polyMesh; // Forward declaration of friend functions and operators - class wallPoint; Ostream& operator<<(Ostream&, const wallPoint&); diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H index 036b6ef36..19df11aec 100644 --- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H +++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H @@ -51,7 +51,6 @@ namespace Foam class dictionary; // Forward declaration of friend functions and operators - class surfZoneIdentifier; Ostream& operator<<(Ostream&, const surfZoneIdentifier&); diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H index 01bcbe225..0e9b8bfe0 100644 --- a/src/thermophysicalModels/specie/specie/specie.H +++ b/src/thermophysicalModels/specie/specie/specie.H @@ -51,7 +51,6 @@ class Istream; class Ostream; // Forward declaration of friend functions and operators - class specie; Ostream& operator<<(Ostream&, const specie&); From c429f3b2750f71bbe866b929165d9dc396eacd19 Mon Sep 17 00:00:00 2001 From: Danial Khazaei Date: Fri, 15 Feb 2019 23:19:15 +0330 Subject: [PATCH 3/5] [bugfix]: recover velocity field in a more general way. avoiding compilation failure in e.g. waves2Foam --- src/finiteVolume/cfdTools/incompressible/CourantNo.H | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/finiteVolume/cfdTools/incompressible/CourantNo.H b/src/finiteVolume/cfdTools/incompressible/CourantNo.H index b1e05b72a..b4c6ae2a2 100644 --- a/src/finiteVolume/cfdTools/incompressible/CourantNo.H +++ b/src/finiteVolume/cfdTools/incompressible/CourantNo.H @@ -61,7 +61,11 @@ else const scalar deltaX = Foam::cbrt(mesh.V()[0]); - velMag = mag(U[0]); + // recover velocity field in a more general way + const volVectorField& URef + = mesh.db().lookupObject("U"); + + velMag = mag(URef[0]); CoNum = velMag*deltaT/deltaX; From 7fee1a978cddb41ff720715bb21768f46f348667 Mon Sep 17 00:00:00 2001 From: Danial Khazaei Date: Sat, 16 Feb 2019 00:22:28 +0330 Subject: [PATCH 4/5] [cxx-syntax]: consistent usage of nullptr. --- .../lduAddressing/lduInterfaces/lduInterface/lduInterface.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C index ac309dbba..11e870e9a 100644 --- a/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C +++ b/src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/lduInterface/lduInterface.C @@ -59,7 +59,7 @@ Foam::autoPtr Foam::lduInterface::prolongationTransfer ); // Dummy return to make the compiler happy - return autoPtr(NULL); + return autoPtr(nullptr); } From e8a0078301d4799f16061ab6ce087c09d187af01 Mon Sep 17 00:00:00 2001 From: Danial Khazaei Date: Sat, 16 Feb 2019 00:44:11 +0330 Subject: [PATCH 5/5] [bugfix]: 64-bit label bugfix some how got overwritten by cfMesh update. --- .../utilities/containers/DynList/DynListI.H | 19 +++++++++++++++++++ .../decomposeCells/decomposeCellsPyramids.C | 6 ++++-- .../helperFunctionsGeometryQueriesI.H | 2 +- .../partTriMeshParallelAddressing.C | 2 +- .../utilities/octrees/meshOctree/meshOctree.C | 2 +- .../meshOctreeAutomaticRefinement.C | 2 +- .../meshOctreeCreatorCreateOctreeBoxes.C | 12 ++++++------ .../meshUntanglerCutRegionFaces.C | 4 ++-- .../edgeExtractor/edgeExtractor.C | 4 +--- 9 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H b/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H index 3692a12cd..a3728f895 100644 --- a/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H +++ b/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H @@ -150,6 +150,25 @@ inline Foam::DynList::DynList(const label s) # endif } + +#if WM_LABEL_SIZE == 64 +template +inline Foam::DynList::DynList(const int s) +: + dataPtr_(nullptr), + nAllocated_(0), + staticData_(), + nextFree_(0) +{ + setSize(s); + + # ifdef DEBUG + checkAllocation(); + # endif +} +#endif + + template inline Foam::DynList::DynList(const label s, const T& val) : diff --git a/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C index eff6ef4bf..16daf21ac 100644 --- a/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C +++ b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsPyramids.C @@ -58,8 +58,10 @@ void decomposeCells::findAddressingForCell const faceListPMG& faces = mesh_.faces(); forAll(faceEdges, feI) { - faceEdges[feI].setSize(faces[c[feI]].size()); - faceEdges[feI] = -1; + DynList& fEdges = faceEdges[feI]; + + fEdges.setSize(faces[c[feI]].size()); + fEdges = label(-1); } forAll(c, fI) diff --git a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H index fb7a7eda7..170876362 100644 --- a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H +++ b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H @@ -1221,7 +1221,7 @@ inline bool doTrianglesOverlap x /= (mag(x) + VSMALL); vector y = vec ^ x; - DynList poly2D(3); + DynList poly2D(label(3)); poly2D[0] = point2D((tri0.a() - origin) & x, (tri0.a() - origin) & y); poly2D[1] = point2D((tri0.b() - origin) & x, (tri0.b() - origin) & y); poly2D[2] = point2D((tri0.c() - origin) & x, (tri0.c() - origin) & y); diff --git a/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C index 14075472c..b4199e149 100644 --- a/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C +++ b/src/mesh/cfMesh/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C @@ -354,7 +354,7 @@ void partTriMesh::createBufferLayers() { const parTriFace& tri = receivedTrias[i]; - DynList triPointLabels(3); + DynList triPointLabels(label(3)); for(label j=0;j<3;++j) { const label gpI = tri.globalLabelOfPoint(j); diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C index e34146e20..498f98d75 100644 --- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C +++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctree.C @@ -136,7 +136,7 @@ void meshOctree::setOctantVectorsAndPositions() //- set vrtLeavesPos_ for(label vrtI=0;vrtI<8;++vrtI) { - FixedList vc(0); + FixedList vc(label(0)); if( vrtI & 1 ) vc[0] += 1; diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C index 28153aefa..c9ee5a5f5 100644 --- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C +++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.C @@ -138,7 +138,7 @@ void meshOctreeAutomaticRefinement::setMaxRefLevel() { finished = false; - const scalar lSize = size / pow(2, label(maxRefLevel_)); + const scalar lSize = size / pow(2.0, label(maxRefLevel_)); if( lSize < cs ) { diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C index 45af48b60..257120620 100644 --- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C +++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreatorCreateOctreeBoxes.C @@ -87,12 +87,12 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters() { finished = false; - const scalar lSize = size / Foam::pow(2, label(globalRefLevel_)); + const scalar lSize = size / pow(label(2), label(globalRefLevel_)); if( lSize < (maxSize * (1.0-SMALL)) ) { const scalar bbSize = - 0.5 * maxSize * Foam::pow(2, label(globalRefLevel_)); + 0.5 * maxSize * pow(label(2), label(globalRefLevel_)); rootBox.max() = c + point(bbSize, bbSize, bbSize); rootBox.min() = c - point(bbSize, bbSize, bbSize); finished = true; @@ -136,7 +136,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters() { finished = false; - const scalar lSize = maxSize / Foam::pow(2, addLevel); + const scalar lSize = maxSize / Foam::pow(label(2), addLevel); if( lSize <= cs ) { @@ -233,7 +233,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters() { finished = false; - const scalar lSize = maxSize / Foam::pow(2, addLevel); + const scalar lSize = maxSize / Foam::pow(label(2), addLevel); if( lSize <= cs ) { @@ -311,7 +311,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters() { finished = false; - const scalar lSize = maxSize / Foam::pow(2, addLevel); + const scalar lSize = maxSize / Foam::pow(label(2), addLevel); if( lSize <= cs ) { @@ -383,7 +383,7 @@ void meshOctreeCreator::setRootCubeSizeAndRefParameters() { finished = false; - const scalar lSize = maxSize / Foam::pow(2, nLevel); + const scalar lSize = maxSize / Foam::pow(label(2), nLevel); if( lSize <= cs ) { diff --git a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C index 83964742d..823fec41f 100644 --- a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C +++ b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntanglerCutRegionFaces.C @@ -75,7 +75,7 @@ void meshUntangler::cutRegion::findNewFaces() << " consisting of edges " << f << endl; # endif - pointUsage = 0; + pointUsage = label(0); DynList newFace; @@ -147,7 +147,7 @@ void meshUntangler::cutRegion::findNewFaces() //- find edges which form the faceInPlane DynList edgeUsage; edgeUsage.setSize(cEdges.size()); - edgeUsage = 0; + edgeUsage = label(0); forAll(cFaces, fI) { const DynList& f = cFaces[fI]; diff --git a/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C index a97e3f6c4..957eb556c 100644 --- a/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C +++ b/src/mesh/cfMesh/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C @@ -29,8 +29,6 @@ Description \*---------------------------------------------------------------------------*/ #include "error.H" -#include "objectRegistry.H" -#include "foamTime.H" #include "polyMeshGenModifier.H" #include "edgeExtractor.H" #include "meshSurfaceEngine.H" @@ -1529,7 +1527,7 @@ bool edgeExtractor::checkConcaveEdgeCells() DynList nFacesInPatch; nFacesInPatch.setSize(2); - nFacesInPatch = 0; + nFacesInPatch = label(0); DynList hasPatchPoints; hasPatchPoints.setSize(2);