diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H index a35877c7f5..1ce37c8958 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H +++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H @@ -91,11 +91,6 @@ class cellSplitter const Map& cellToCells ) const; - //- Disallow default bitwise copy construction - cellSplitter(const cellSplitter&) = delete; - - //- Disallow default bitwise assignment - void operator=(const cellSplitter&) = delete; public: @@ -107,6 +102,9 @@ public: //- Construct from mesh cellSplitter(const polyMesh& mesh); + //- Disallow default bitwise copy construction + cellSplitter(const cellSplitter&) = delete; + //- Destructor ~cellSplitter(); @@ -135,6 +133,12 @@ public: { return addedPoints_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cellSplitter&) = delete; }; diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.H b/applications/utilities/mesh/advanced/selectCells/edgeStats.H index 6acb10edd5..53877e0b85 100644 --- a/applications/utilities/mesh/advanced/selectCells/edgeStats.H +++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.H @@ -68,13 +68,6 @@ class edgeStats direction getNormalDir(const twoDPointCorrector*) const; - //- Disallow default bitwise copy construction - edgeStats(const edgeStats&) = delete; - - //- Disallow default bitwise assignment - void operator=(const edgeStats&) = delete; - - public: // Static Data Members @@ -91,11 +84,20 @@ public: //- Construct from mesh and corrector edgeStats(const polyMesh& mesh, const twoDPointCorrector* ); + //- Disallow default bitwise copy construction + edgeStats(const edgeStats&) = delete; + // Member Functions //- Calculate minimum edge length and print scalar minLen(Ostream& os) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const edgeStats&) = delete; }; diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H index 0eb820c6a2..b4740c1b28 100644 --- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H +++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H @@ -74,12 +74,6 @@ class hexBlock // Private Member Functions - //- Disallow default bitwise copy construction - hexBlock(const hexBlock&) = delete; - - //- Disallow default bitwise assignment - void operator=(const hexBlock&) = delete; - //- Vertex addressing inside the block inline label vtxLabel(label i, label j, label k) const; @@ -91,6 +85,10 @@ public: //- Construct from components hexBlock(const label nx, const label ny, const label nz); + //- Disallow default bitwise copy construction + hexBlock(const hexBlock&) = delete; + + // Member Functions //- Number of points @@ -145,6 +143,12 @@ public: //- Read block points void readPoints(Istream&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const hexBlock&) = delete; }; diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H index 62176a582e..376d22f08c 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H +++ b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H @@ -141,13 +141,6 @@ class sammMesh // Private Member Functions - //- Disallow default bitwise copy construction - sammMesh(const sammMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const sammMesh&) = delete; - - //- Fill SAMM lookup tables void fillSammCellShapeTable(); void fillSammAddressingTable(); @@ -230,6 +223,9 @@ public: const scalar scaleFactor ); + //- Disallow default bitwise copy construction + sammMesh(const sammMesh&) = delete; + //- Destructor ~sammMesh(); @@ -239,6 +235,12 @@ public: //- Write mesh void writeMesh(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const sammMesh&) = delete; }; diff --git a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H index 77eab69cd2..17fa8538c2 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H +++ b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H @@ -185,13 +185,6 @@ class starMesh // Private Member Functions - //- Disallow default bitwise copy construction - starMesh(const starMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const starMesh&) = delete; - - //- Read fixed format vertex label static label readVtxLabel(IFstream&); @@ -295,6 +288,9 @@ public: const scalar scaleFactor ); + //- Disallow default bitwise copy construction + starMesh(const starMesh&) = delete; + //- Destructor ~starMesh(); @@ -304,6 +300,12 @@ public: //- Write mesh void writeMesh(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const starMesh&) = delete; }; diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H index 8fa2cd9f46..8f440cb500 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H @@ -86,13 +86,6 @@ class extrudedMesh ); - //- Disallow default bitwise copy construction - extrudedMesh(const extrudedMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const extrudedMesh&) = delete; - - public: // Constructors @@ -105,6 +98,15 @@ public: const PrimitivePatch& extrudePatch, const extrudeModel& ); + + //- Disallow default bitwise copy construction + extrudedMesh(const extrudedMesh&) = delete; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const extrudedMesh&) = delete; }; diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H index 1e656ffa95..d356ae3495 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H +++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H @@ -87,11 +87,6 @@ class extrude2DMesh //- Find extrusion direction // void findExtrudeDirection(); - //- Disallow default bitwise copy construction - extrude2DMesh(const extrude2DMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const extrude2DMesh&) = delete; public: @@ -107,6 +102,9 @@ public: const extrudeModel& model ); + //- Disallow default bitwise copy construction + extrude2DMesh(const extrude2DMesh&) = delete; + //- Destructor ~extrude2DMesh(); @@ -138,6 +136,11 @@ public: return backPatchi_; } + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const extrude2DMesh&) = delete; }; diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H index 15cbd974ed..567a551eb3 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H +++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H @@ -85,12 +85,6 @@ class patchToPoly2DMesh void createPolyMeshComponents(); - //- Disallow default bitwise copy construction - patchToPoly2DMesh(const patchToPoly2DMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const patchToPoly2DMesh&) = delete; - public: @@ -105,6 +99,9 @@ public: const EdgeMap