diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H index 855fc62851..fc9a0a8be9 100644 --- a/src/conversion/ensight/file/ensightFile.H +++ b/src/conversion/ensight/file/ensightFile.H @@ -64,15 +64,6 @@ class ensightFile static string dirFmt_; - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const ensightFile&) = delete; - - //- Disallow default bitwise copy construction - ensightFile(const ensightFile&); - - public: // Constructors @@ -84,6 +75,9 @@ public: IOstream::streamFormat format=IOstream::BINARY ); + //- Disallow default bitwise copy construction + ensightFile(const ensightFile&); + //- Destructor ~ensightFile(); @@ -152,6 +146,12 @@ public: //- Add carriage return to ascii stream void newline(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ensightFile&) = delete; }; diff --git a/src/conversion/ensight/file/ensightGeoFile.H b/src/conversion/ensight/file/ensightGeoFile.H index 92351f3cbc..7b4b84d7ab 100644 --- a/src/conversion/ensight/file/ensightGeoFile.H +++ b/src/conversion/ensight/file/ensightGeoFile.H @@ -47,15 +47,6 @@ class ensightGeoFile : public ensightFile { - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const ensightGeoFile&) = delete; - - //- Disallow default bitwise copy construction - ensightGeoFile(const ensightGeoFile&); - - public: // Constructors @@ -67,6 +58,10 @@ public: IOstream::streamFormat format=IOstream::BINARY ); + //- Disallow default bitwise copy construction + ensightGeoFile(const ensightGeoFile&); + + //- Destructor ~ensightGeoFile(); @@ -76,6 +71,12 @@ public: //- Write keyword with trailing newline virtual Ostream& writeKeyword(const string& key); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ensightGeoFile&) = delete; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H index 9c0c4dd80e..d2a720b0f7 100644 --- a/src/conversion/ensight/part/ensightPart.H +++ b/src/conversion/ensight/part/ensightPart.H @@ -346,10 +346,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const ensightPart&) - { - NotImplemented; - } + void operator=(const ensightPart&) = delete; // IOstream Operators @@ -359,7 +356,6 @@ public: //- Write geometry friend ensightGeoFile& operator<<(ensightGeoFile&, const ensightPart&); - }; diff --git a/src/conversion/ensight/part/ensightPartCells.H b/src/conversion/ensight/part/ensightPartCells.H index d977349c3e..6c52db132f 100644 --- a/src/conversion/ensight/part/ensightPartCells.H +++ b/src/conversion/ensight/part/ensightPartCells.H @@ -53,9 +53,6 @@ class ensightPartCells { // Private Member Functions - //- Disallow default bitwise assignment - void operator=(const ensightPartCells&) = delete; - //- Classify the cell types, set elemLists. void classify ( @@ -164,6 +161,12 @@ public: { return elemTypes_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ensightPartCells&) = delete; }; diff --git a/src/conversion/ensight/part/ensightPartFaces.H b/src/conversion/ensight/part/ensightPartFaces.H index 2a11c39bd7..3a27c9e318 100644 --- a/src/conversion/ensight/part/ensightPartFaces.H +++ b/src/conversion/ensight/part/ensightPartFaces.H @@ -52,9 +52,6 @@ class ensightPartFaces { // Private Member Functions - //- Disallow default bitwise assignment - void operator=(const ensightPartFaces&) = delete; - //- Track points used virtual localPoints calcLocalPoints() const; @@ -168,6 +165,12 @@ public: { return elemTypes_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ensightPartFaces&) = delete; }; diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H index 300e42ce31..07ef2ac88a 100644 --- a/src/conversion/ensight/part/ensightParts.H +++ b/src/conversion/ensight/part/ensightParts.H @@ -64,14 +64,6 @@ class ensightParts //- List of parts PtrList partsList_; - // Private Member Functions - - //- Disallow default bitwise copy construction - ensightParts(const ensightParts&) = delete; - - //- Disallow default bitwise assignment - void operator=(const ensightParts&) = delete; - public: @@ -83,6 +75,9 @@ public: //- Construct from IOobject ensightParts(const IOobject&); + //- Disallow default bitwise copy construction + ensightParts(const ensightParts&) = delete; + //- Destructor ~ensightParts(); @@ -149,6 +144,13 @@ public: ) const; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ensightParts&) = delete; + + // Friend Operators //- Write geometry diff --git a/src/conversion/meshReader/meshReader.H b/src/conversion/meshReader/meshReader.H index 469761a027..05845ab816 100644 --- a/src/conversion/meshReader/meshReader.H +++ b/src/conversion/meshReader/meshReader.H @@ -172,12 +172,6 @@ private: // Private Member Functions - //- Disallow default bitwise copy construction - meshReader(const meshReader&) = delete; - - //- Disallow default bitwise assignment - void operator=(const meshReader&) = delete; - //- Calculate pointCells void calcPointCells() const; @@ -304,6 +298,9 @@ public: //- Construct from fileName meshReader(const fileName&, const scalar scaleFactor = 1.0); + //- Disallow default bitwise copy construction + meshReader(const meshReader&) = delete; + //- Destructor virtual ~meshReader(); @@ -323,6 +320,12 @@ public: const polyMesh&, IOstream::streamFormat fmt = IOstream::BINARY ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const meshReader&) = delete; }; diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.H b/src/conversion/meshReader/starcd/STARCDMeshReader.H index 391f8f7dd6..3cb127157a 100644 --- a/src/conversion/meshReader/starcd/STARCDMeshReader.H +++ b/src/conversion/meshReader/starcd/STARCDMeshReader.H @@ -114,17 +114,6 @@ protected: static bool readHeader(IFstream&, word fileSignature); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - STARCD(const STARCD&) = delete; - - //- Disallow default bitwise assignment - void operator=(const STARCD&) = delete; - - protected: enum cellType @@ -168,9 +157,18 @@ public: const scalar scaleFactor = 1.0 ); + //- Disallow default bitwise copy construction + STARCD(const STARCD&) = delete; + //- Destructor virtual ~STARCD(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const STARCD&) = delete; }; diff --git a/src/conversion/meshTables/boundaryRegion.H b/src/conversion/meshTables/boundaryRegion.H index 244cce6450..377f949eb9 100644 --- a/src/conversion/meshTables/boundaryRegion.H +++ b/src/conversion/meshTables/boundaryRegion.H @@ -72,12 +72,6 @@ class boundaryRegion : public Map { - // Private Member Functions - - //- Disallow default bitwise copy construction - boundaryRegion(const boundaryRegion&) = delete; - - public: // Constructors @@ -93,6 +87,9 @@ public: const fileName& instance = "constant" ); + //- Disallow default bitwise copy construction + boundaryRegion(const boundaryRegion&) = delete; + //- Destructor ~boundaryRegion(); diff --git a/src/conversion/meshTables/cellTable.H b/src/conversion/meshTables/cellTable.H index 1182937c5d..f091dd2808 100644 --- a/src/conversion/meshTables/cellTable.H +++ b/src/conversion/meshTables/cellTable.H @@ -97,9 +97,6 @@ class cellTable void setEntry(const label id, const word& keyWord, const word& value); - //- Disallow default bitwise copy construction - cellTable(const cellTable&) = delete; - public: @@ -116,6 +113,9 @@ public: const fileName& instance = "constant" ); + //- Disallow default bitwise copy construction + cellTable(const cellTable&) = delete; + //- Destructor ~cellTable(); diff --git a/src/conversion/meshWriter/meshWriter.H b/src/conversion/meshWriter/meshWriter.H index 62785bb904..2068c4c2d2 100644 --- a/src/conversion/meshWriter/meshWriter.H +++ b/src/conversion/meshWriter/meshWriter.H @@ -89,15 +89,6 @@ namespace Foam class meshWriter { - // Private Member Functions - - //- Disallow default bitwise copy construction - meshWriter(const meshWriter&) = delete; - - //- Disallow default bitwise assignment - void operator=(const meshWriter&) = delete; - - protected: // Protected data @@ -144,6 +135,9 @@ public: const scalar scaleFactor = 1.0 ); + //- Disallow default bitwise copy construction + meshWriter(const meshWriter&) = delete; + //- Destructor virtual ~meshWriter(); @@ -173,6 +167,11 @@ public: const fileName& timeName = fileName::null ) const = 0; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const meshWriter&) = delete; }; diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.H b/src/conversion/meshWriter/starcd/STARCDMeshWriter.H index e065cc24bb..c4f67a140b 100644 --- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.H +++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.H @@ -64,12 +64,6 @@ class STARCD // Private Member Functions - //- Disallow default bitwise copy construction - STARCD(const STARCD&) = delete; - - //- Disallow default bitwise assignment - void operator=(const STARCD&) = delete; - //- Pro-STAR 4+ header format static void writeHeader(Ostream&, const char* filetype); @@ -104,6 +98,9 @@ public: const scalar scaleFactor = 1.0 ); + //- Disallow default bitwise copy construction + STARCD(const STARCD&) = delete; + //- Destructor virtual ~STARCD(); @@ -125,6 +122,11 @@ public: const fileName& meshName = fileName::null ) const; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const STARCD&) = delete; }; diff --git a/src/conversion/polyDualMesh/polyDualMesh.H b/src/conversion/polyDualMesh/polyDualMesh.H index 57b8c9e55a..e7b8182272 100644 --- a/src/conversion/polyDualMesh/polyDualMesh.H +++ b/src/conversion/polyDualMesh/polyDualMesh.H @@ -147,13 +147,6 @@ class polyDualMesh ); - //- Disallow default bitwise copy construction - polyDualMesh(const polyDualMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const polyDualMesh&) = delete; - - public: //- Runtime type information @@ -183,6 +176,9 @@ public: const scalar featureCos ); + //- Disallow default bitwise copy construction + polyDualMesh(const polyDualMesh&) = delete; + //- Helper function to create feature edges and points based on // feature angle and patches. static void calcFeatures @@ -213,6 +209,12 @@ public: { return boundaryFacePoint_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const polyDualMesh&) = delete; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H index c92cd6161f..bb4e5135e3 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H @@ -62,12 +62,6 @@ class dynamicFvMesh //- Return the dynamicMeshDict IOobject static IOobject dynamicMeshDictIOobject(const IOobject& io); - //- Disallow default bitwise copy construction - dynamicFvMesh(const dynamicFvMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const dynamicFvMesh&) = delete; - public: @@ -142,6 +136,9 @@ public: const bool syncPar = true ); + //- Disallow default bitwise copy construction + dynamicFvMesh(const dynamicFvMesh&) = delete; + // Selectors @@ -171,6 +168,12 @@ public: //- Update the mesh for both mesh motion and topology change virtual bool update() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const dynamicFvMesh&) = delete; }; diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H index 647f6f45b7..67de29516d 100644 --- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H +++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H @@ -73,15 +73,6 @@ class dynamicInkJetFvMesh velocityMotionCorrection velocityMotionCorrection_; - // Private Member Functions - - //- Disallow default bitwise copy construction - dynamicInkJetFvMesh(const dynamicInkJetFvMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const dynamicInkJetFvMesh&) = delete; - - public: //- Runtime type information @@ -93,6 +84,9 @@ public: //- Construct from IOobject dynamicInkJetFvMesh(const IOobject& io); + //- Disallow default bitwise copy construction + dynamicInkJetFvMesh(const dynamicInkJetFvMesh&) = delete; + //- Destructor ~dynamicInkJetFvMesh(); @@ -102,6 +96,12 @@ public: //- Update the mesh for both mesh motion and topology change virtual bool update(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const dynamicInkJetFvMesh&) = delete; }; diff --git a/src/dynamicFvMesh/dynamicInterpolatedFvMesh/dynamicInterpolatedFvMesh.H b/src/dynamicFvMesh/dynamicInterpolatedFvMesh/dynamicInterpolatedFvMesh.H index b233aa0a60..e91deb5080 100644 --- a/src/dynamicFvMesh/dynamicInterpolatedFvMesh/dynamicInterpolatedFvMesh.H +++ b/src/dynamicFvMesh/dynamicInterpolatedFvMesh/dynamicInterpolatedFvMesh.H @@ -91,15 +91,6 @@ class dynamicInterpolatedFvMesh velocityMotionCorrection velocityMotionCorrection_; - // Private Member Functions - - //- Disallow default bitwise copy construction - dynamicInterpolatedFvMesh(const dynamicInterpolatedFvMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const dynamicInterpolatedFvMesh&) = delete; - - public: //- Runtime type information @@ -111,6 +102,9 @@ public: //- Construct from IOobject dynamicInterpolatedFvMesh(const IOobject& io); + //- Disallow default bitwise copy construction + dynamicInterpolatedFvMesh(const dynamicInterpolatedFvMesh&) = delete; + //- Destructor ~dynamicInterpolatedFvMesh(); @@ -120,6 +114,12 @@ public: //- Update the mesh for both mesh motion and topology change virtual bool update(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const dynamicInterpolatedFvMesh&) = delete; }; diff --git a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H index ef8ea96977..71228619a2 100644 --- a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H +++ b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H @@ -62,15 +62,6 @@ class dynamicMotionSolverFvMesh velocityMotionCorrection velocityMotionCorrection_; - // Private Member Functions - - //- Disallow default bitwise copy construction - dynamicMotionSolverFvMesh(const dynamicMotionSolverFvMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const dynamicMotionSolverFvMesh&) = delete; - - public: //- Runtime type information @@ -82,6 +73,9 @@ public: //- Construct from IOobject dynamicMotionSolverFvMesh(const IOobject& io); + //- Disallow default bitwise copy construction + dynamicMotionSolverFvMesh(const dynamicMotionSolverFvMesh&) = delete; + //- Destructor ~dynamicMotionSolverFvMesh(); @@ -106,6 +100,12 @@ public: IOstream::compressionType cmp, const bool write = true ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const dynamicMotionSolverFvMesh&) = delete; }; diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H index 10345ef552..7c688eba03 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H @@ -186,13 +186,6 @@ protected: label& nProtected ) const; -private: - - //- Disallow default bitwise copy construction - dynamicRefineFvMesh(const dynamicRefineFvMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const dynamicRefineFvMesh&) = delete; public: @@ -205,6 +198,9 @@ public: //- Construct from IOobject explicit dynamicRefineFvMesh(const IOobject& io); + //- Disallow default bitwise copy construction + dynamicRefineFvMesh(const dynamicRefineFvMesh&) = delete; + //- Destructor virtual ~dynamicRefineFvMesh(); @@ -244,6 +240,12 @@ public: IOstream::compressionType cmp, const bool write = true ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const dynamicRefineFvMesh&) = delete; }; diff --git a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H index 3a66c00001..0a3d956945 100644 --- a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H +++ b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H @@ -50,15 +50,6 @@ class staticFvMesh : public dynamicFvMesh { - // Private Member Functions - - //- Disallow default bitwise copy construction - staticFvMesh(const staticFvMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const staticFvMesh&) = delete; - - public: //- Runtime type information @@ -70,6 +61,9 @@ public: //- Construct from IOobject staticFvMesh(const IOobject& io); + //- Disallow default bitwise copy construction + staticFvMesh(const staticFvMesh&) = delete; + //- Destructor ~staticFvMesh(); @@ -85,6 +79,12 @@ public: //- Dummy update function which does not change the mesh virtual bool update(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const staticFvMesh&) = delete; }; diff --git a/src/dynamicMesh/attachDetach/attachDetach.H b/src/dynamicMesh/attachDetach/attachDetach.H index b1b9135a6d..0844bfed91 100644 --- a/src/dynamicMesh/attachDetach/attachDetach.H +++ b/src/dynamicMesh/attachDetach/attachDetach.H @@ -107,12 +107,6 @@ class attachDetach // Private Member Functions - //- Disallow default bitwise copy construction - attachDetach(const attachDetach&) = delete; - - //- Disallow default bitwise assignment - void operator=(const attachDetach&) = delete; - //- Check validity of construction data void checkDefinition(); @@ -170,6 +164,9 @@ public: const polyTopoChanger& mesh ); + //- Disallow default bitwise copy construction + attachDetach(const attachDetach&) = delete; + //- Destructor virtual ~attachDetach(); @@ -225,12 +222,17 @@ public: return triggerTimes_; } - //- Write virtual void write(Ostream&) const; //- Write dictionary virtual void writeDict(Ostream&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const attachDetach&) = delete; }; diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H index 7ccd65ead6..ee6a1f5799 100644 --- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H +++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H @@ -172,13 +172,6 @@ class boundaryMesh ) const; - //- Disallow default bitwise copy construction - boundaryMesh(const boundaryMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const boundaryMesh&) = delete; - - public: //- Runtime type information @@ -190,6 +183,9 @@ public: //- Construct null boundaryMesh(); + //- Disallow default bitwise copy construction + boundaryMesh(const boundaryMesh&) = delete; + //- Destructor ~boundaryMesh(); @@ -381,6 +377,12 @@ public: const label facei, boolList& visited ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const boundaryMesh&) = delete; }; diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.H b/src/dynamicMesh/createShellMesh/createShellMesh.H index 101e62e719..926088face 100644 --- a/src/dynamicMesh/createShellMesh/createShellMesh.H +++ b/src/dynamicMesh/createShellMesh/createShellMesh.H @@ -96,13 +96,6 @@ class createShellMesh ); - //- Disallow default bitwise copy construction - createShellMesh(const createShellMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const createShellMesh&) = delete; - - public: //- Runtime type information @@ -119,6 +112,9 @@ public: const labelList& regionPoints ); + //- Disallow default bitwise copy construction + createShellMesh(const createShellMesh&) = delete; + // Member Functions @@ -149,6 +145,10 @@ public: return faceToEdgeMap_; } + //- Disallow default bitwise assignment + void operator=(const createShellMesh&) = delete; + + //- From region point to patch point. const labelList& pointToPointMap() const { @@ -191,6 +191,9 @@ public: polyTopoChange& meshMod ); + + // Member Operators + //- Update any locally stored mesh information. void updateMesh(const mapPolyMesh&); }; diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H index 9225e03f3e..6f3dc27f1e 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H @@ -328,11 +328,6 @@ class fvMeshDistribute const dictionary& fieldDicts ); - //- Disallow default bitwise copy construction - fvMeshDistribute(const fvMeshDistribute&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fvMeshDistribute&) = delete; public: @@ -344,6 +339,9 @@ public: //- Construct from mesh and absolute merge tolerance fvMeshDistribute(fvMesh& mesh, const scalar mergeTol); + //- Disallow default bitwise copy construction + fvMeshDistribute(const fvMeshDistribute&) = delete; + // Member Functions @@ -372,6 +370,12 @@ public: //- Print some info on mesh. static void printMeshInfo(const fvMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fvMeshDistribute&) = delete; }; diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H index 464a64f96b..cf0b033866 100644 --- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H +++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H @@ -134,11 +134,6 @@ class fvMeshSubset const label currentRegion ) const; - //- Disallow default bitwise copy construction - fvMeshSubset(const fvMeshSubset&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fvMeshSubset&) = delete; public: @@ -147,6 +142,9 @@ public: //- Construct given a mesh to subset explicit fvMeshSubset(const fvMesh&); + //- Disallow default bitwise copy construction + fvMeshSubset(const fvMeshSubset&) = delete; + // Member Functions @@ -317,6 +315,12 @@ public: template tmp> interpolate(const DimensionedField&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fvMeshSubset&) = delete; }; diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H index f2ecf623ed..ba90b9e3d4 100644 --- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H +++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H @@ -88,12 +88,6 @@ class layerAdditionRemoval // Private Member Functions - //- Disallow default bitwise copy construction - layerAdditionRemoval(const layerAdditionRemoval&) = delete; - - //- Disallow default bitwise assignment - void operator=(const layerAdditionRemoval&) = delete; - //- Check validity of construction data void checkDefinition(); @@ -170,6 +164,9 @@ public: const polyTopoChanger& ptc ); + //- Disallow default bitwise copy construction + layerAdditionRemoval(const layerAdditionRemoval&) = delete; + //- Destructor virtual ~layerAdditionRemoval(); @@ -217,6 +214,12 @@ public: //- Write dictionary virtual void writeDict(Ostream&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const layerAdditionRemoval&) = delete; }; diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H index 90a15c6827..f05aa8e8bf 100644 --- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H +++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H @@ -450,13 +450,6 @@ class cellCuts void check() const; - //- Disallow default bitwise copy construction - cellCuts(const cellCuts&) = delete; - - //- Disallow default bitwise assignment - void operator=(const cellCuts&) = delete; - - public: //- Runtime type information @@ -527,6 +520,9 @@ public: const labelListList& cellAnchorPoints ); + //- Disallow default bitwise copy construction + cellCuts(const cellCuts&) = delete; + //- Destructor ~cellCuts(); @@ -631,6 +627,11 @@ public: //- debugging:Write edges of cell and loop void writeCellOBJ(const fileName& dir, const label celli) const; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cellCuts&) = delete; }; diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H index d1f1718f1d..8e962ecea4 100644 --- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H +++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H @@ -104,17 +104,6 @@ protected: label getMisAlignedEdge(const vector& refDir, const label celli) const; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - cellLooper(const cellLooper&) = delete; - - //- Disallow default bitwise assignment - void operator=(const cellLooper&) = delete; - - public: //- Runtime type information @@ -141,6 +130,9 @@ public: //- Construct from components cellLooper(const polyMesh& mesh); + //- Disallow default bitwise copy construction + cellLooper(const cellLooper&) = delete; + //- Clone autoPtr clone() const { @@ -197,6 +189,11 @@ public: scalarField& loopWeights ) const = 0; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cellLooper&) = delete; }; diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H index 6d225a6bbc..f9c1f83357 100644 --- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H +++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H @@ -65,7 +65,6 @@ class geomCellLooper : public cellLooper { - // Static //- Tolerance for point equal test. Fraction of edge length. @@ -112,13 +111,6 @@ class geomCellLooper bool edgeEndsCut(const labelList&, const label index) const; - //- Disallow default bitwise copy construction - geomCellLooper(const geomCellLooper&) = delete; - - //- Disallow default bitwise assignment - void operator=(const geomCellLooper&) = delete; - - public: //- Runtime type information @@ -138,13 +130,14 @@ public: } - - // Constructors //- Construct from components geomCellLooper(const polyMesh& mesh); + //- Disallow default bitwise copy construction + geomCellLooper(const geomCellLooper&) = delete; + //- Destructor virtual ~geomCellLooper(); @@ -152,8 +145,6 @@ public: // Member Functions - - //- Create cut along circumference of celli. Gets current mesh cuts. // Cut along circumference is expressed as loop of cuts plus weights // for cuts along edges (only valid for edge cuts). @@ -183,6 +174,12 @@ public: labelList& loop, scalarField& loopWeights ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const geomCellLooper&) = delete; }; diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H index 21525f18cf..7f8545735e 100644 --- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H +++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H @@ -97,13 +97,6 @@ private: ) const; - //- Disallow default bitwise copy construction - hexCellLooper(const hexCellLooper&) = delete; - - //- Disallow default bitwise assignment - void operator=(const hexCellLooper&) = delete; - - public: //- Runtime type information @@ -115,6 +108,9 @@ public: //- Construct from components hexCellLooper(const polyMesh& mesh); + //- Disallow default bitwise copy construction + hexCellLooper(const hexCellLooper&) = delete; + //- Destructor virtual ~hexCellLooper(); @@ -152,6 +148,12 @@ public: labelList& loop, scalarField& loopWeights ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const hexCellLooper&) = delete; }; diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H index 9d00ef126c..fc98eb0e40 100644 --- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H +++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H @@ -144,13 +144,6 @@ class topoCellLooper ) const; - //- Disallow default bitwise copy construction - topoCellLooper(const topoCellLooper&) = delete; - - //- Disallow default bitwise assignment - void operator=(const topoCellLooper&) = delete; - - public: //- Runtime type information @@ -167,6 +160,9 @@ public: //- Construct from components topoCellLooper(const polyMesh& mesh); + //- Disallow default bitwise copy construction + topoCellLooper(const topoCellLooper&) = delete; + //- Destructor virtual ~topoCellLooper(); @@ -203,6 +199,12 @@ public: labelList& loop, scalarField& loopWeights ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const topoCellLooper&) = delete; }; diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H index ffa6cfe2d3..9176331ee8 100644 --- a/src/dynamicMesh/meshCut/directions/directions.H +++ b/src/dynamicMesh/meshCut/directions/directions.H @@ -126,12 +126,6 @@ private: const vector& defaultDir ); - //- Disallow default bitwise copy construction - directions(const directions&) = delete; - - //- Disallow default bitwise assignment - void operator=(const directions&) = delete; - public: @@ -144,6 +138,15 @@ public: const dictionary& dict, const twoDPointCorrector* correct2DPtr = nullptr ); + + //- Disallow default bitwise copy construction + directions(const directions&) = delete; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const directions&) = delete; }; diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H index 53176435ea..95faaa4185 100644 --- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H +++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H @@ -58,14 +58,6 @@ class edgeVertex // here saves storing reference at higher levels where we do need it) const polyMesh& mesh_; - // Private Member Functions - - //- Disallow default bitwise copy construction - edgeVertex(const edgeVertex&) = delete; - - //- Disallow default bitwise assignment - void operator=(const edgeVertex&) = delete; - public: @@ -93,6 +85,9 @@ public: mesh_(mesh) {} + //- Disallow default bitwise copy construction + edgeVertex(const edgeVertex&) = delete; + // Member Functions @@ -215,8 +210,18 @@ public: Ostream& writeCut(Ostream& os, const label cut, const scalar) const; //- Write cut descriptions to Ostream - Ostream& writeCuts(Ostream& os, const labelList&, const scalarField&) - const; + Ostream& writeCuts + ( + Ostream& os, + const labelList&, + const scalarField& + ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const edgeVertex&) = delete; }; diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H index b8da1d4e61..0ad5f8f690 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H +++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H @@ -111,12 +111,6 @@ class boundaryCutter ) const; - //- Disallow default bitwise copy construction - boundaryCutter(const boundaryCutter&) = delete; - - //- Disallow default bitwise assignment - void operator=(const boundaryCutter&) = delete; - public: //- Runtime type information @@ -127,6 +121,9 @@ public: //- Construct from mesh boundaryCutter(const polyMesh& mesh); + //- Disallow default bitwise copy construction + boundaryCutter(const boundaryCutter&) = delete; + //- Destructor ~boundaryCutter(); @@ -171,6 +168,11 @@ public: return faceAddedPoint_; } + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const boundaryCutter&) = delete; }; diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H index 244dacf2fe..24547e969c 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H +++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H @@ -174,13 +174,6 @@ class meshCutAndRemove ) const; - - //- Disallow default bitwise copy construction - meshCutAndRemove(const meshCutAndRemove&) = delete; - - //- Disallow default bitwise assignment - void operator=(const meshCutAndRemove&) = delete; - public: //- Runtime type information @@ -192,6 +185,9 @@ public: //- Construct from mesh meshCutAndRemove(const polyMesh& mesh); + //- Disallow default bitwise copy construction + meshCutAndRemove(const meshCutAndRemove&) = delete; + // Member Functions @@ -229,6 +225,12 @@ public: { return addedPoints_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const meshCutAndRemove&) = delete; }; diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H index 1f0730e023..e67109311b 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H +++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H @@ -256,14 +256,6 @@ class meshCutter ) const; - - //- Disallow default bitwise copy construction - meshCutter(const meshCutter&) = delete; - - //- Disallow default bitwise assignment - void operator=(const meshCutter&) = delete; - - public: //- Runtime type information @@ -275,6 +267,9 @@ public: //- Construct from mesh meshCutter(const polyMesh& mesh); + //- Disallow default bitwise copy construction + meshCutter(const meshCutter&) = delete; + //- Destructor ~meshCutter(); @@ -311,6 +306,12 @@ public: { return addedPoints_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const meshCutter&) = delete; }; diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H index 062964919a..e4fac2971b 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H +++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H @@ -138,13 +138,6 @@ class multiDirRefinement ); - //- Disallow default bitwise copy construction - multiDirRefinement(const multiDirRefinement&) = delete; - - //- Disallow default bitwise assignment - void operator=(const multiDirRefinement&) = delete; - - public: //- Runtime type information @@ -184,6 +177,9 @@ public: const bool writeMesh = false // write intermediate meshes ); + //- Disallow default bitwise copy construction + multiDirRefinement(const multiDirRefinement&) = delete; + // Member Functions @@ -192,6 +188,12 @@ public: { return addedCells_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const multiDirRefinement&) = delete; }; diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H index 20ab1811b1..c4faab9a0a 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H +++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H @@ -128,13 +128,6 @@ class undoableMeshCutter static void updateLabels(const labelList& map, Map&); - //- Disallow default bitwise copy construction - undoableMeshCutter(const undoableMeshCutter&) = delete; - - //- Disallow default bitwise assignment - void operator=(const undoableMeshCutter&) = delete; - - public: //- Runtime type information @@ -148,6 +141,9 @@ public: // to be stored. undoableMeshCutter(const polyMesh& mesh, const bool undoable = true); + //- Disallow default bitwise copy construction + undoableMeshCutter(const undoableMeshCutter&) = delete; + //- Destructor ~undoableMeshCutter(); @@ -199,6 +195,12 @@ public: const labelList& splitFaces, polyTopoChange& ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const undoableMeshCutter&) = delete; }; diff --git a/src/dynamicMesh/meshCut/splitCell/splitCell.H b/src/dynamicMesh/meshCut/splitCell/splitCell.H index 6b5e382838..e19502d356 100644 --- a/src/dynamicMesh/meshCut/splitCell/splitCell.H +++ b/src/dynamicMesh/meshCut/splitCell/splitCell.H @@ -66,15 +66,6 @@ class splitCell splitCell* slave_; - // Private Member Functions - - //- Disallow default bitwise copy construction - splitCell(const splitCell&) = delete; - - //- Disallow default bitwise assignment - void operator=(const splitCell&) = delete; - - public: // Constructors @@ -82,6 +73,9 @@ public: //- Construct from cell number and parent splitCell(const label celli, splitCell* parent); + //- Disallow default bitwise copy construction + splitCell(const splitCell&) = delete; + //- Destructor ~splitCell(); @@ -139,6 +133,12 @@ public: //- Returns other half of split cell. I.e. slave if this is master. splitCell* getOther() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const splitCell&) = delete; }; diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H index c6b393ebcf..ffb2267f3b 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H @@ -283,12 +283,6 @@ class motionSmootherAlgo PackedBoolList& isAffectedPoint ) const; - //- Disallow default bitwise copy construction - motionSmootherAlgo(const motionSmootherAlgo&) = delete; - - //- Disallow default bitwise assignment - void operator=(const motionSmootherAlgo&) = delete; - public: @@ -309,6 +303,9 @@ public: const dictionary& paramDict ); + //- Disallow default bitwise copy construction + motionSmootherAlgo(const motionSmootherAlgo&) = delete; + //- Destructor ~motionSmootherAlgo(); @@ -499,6 +496,12 @@ public: const scalarField& edgeWeight, GeometricField& newFld ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const motionSmootherAlgo&) = delete; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H index 5deeeb71c4..b9de6e8532 100644 --- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H @@ -80,15 +80,6 @@ private: //- Return the component corresponding to the given component name direction cmpt(const word& cmptName) const; - //- Disallow default bitwise copy construction - componentDisplacementMotionSolver - ( - const componentDisplacementMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const componentDisplacementMotionSolver&) = delete; - public: @@ -106,6 +97,12 @@ public: const word& type ); + //- Disallow default bitwise copy construction + componentDisplacementMotionSolver + ( + const componentDisplacementMotionSolver& + ); + //- Destructor virtual ~componentDisplacementMotionSolver(); @@ -130,6 +127,12 @@ public: //- Update local data for topology changes virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const componentDisplacementMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H index 059c310345..cbaaff8b6f 100644 --- a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H @@ -77,15 +77,6 @@ private: //- Return the component corresponding to the given component name direction cmpt(const word& cmptName) const; - //- Disallow default bitwise copy construction - componentVelocityMotionSolver - ( - const componentVelocityMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const componentVelocityMotionSolver&) = delete; - public: @@ -103,6 +94,12 @@ public: const word& type ); + //- Disallow default bitwise copy construction + componentVelocityMotionSolver + ( + const componentVelocityMotionSolver& + ); + //- Destructor virtual ~componentVelocityMotionSolver(); @@ -122,6 +119,12 @@ public: //- Update local data for topology changes virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const componentVelocityMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H index 1779e43a26..61cbb8738c 100644 --- a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H @@ -61,16 +61,6 @@ protected: mutable pointVectorField pointDisplacement_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - displacementMotionSolver(const displacementMotionSolver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const displacementMotionSolver&) = delete; - public: //- Runtime type information @@ -87,6 +77,9 @@ public: const word& type ); + //- Disallow default bitwise copy construction + displacementMotionSolver(const displacementMotionSolver&) = delete; + //- Destructor virtual ~displacementMotionSolver(); @@ -105,6 +98,12 @@ public: { return pointDisplacement_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const displacementMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H index e0d3b864bb..7cbed0eb97 100644 --- a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H @@ -84,18 +84,6 @@ class displacementInterpolationMotionSolver FixedList, 3> rangeToWeights_; - // Private Member Functions - - //- Disallow default bitwise copy construction - displacementInterpolationMotionSolver - ( - const displacementInterpolationMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const displacementInterpolationMotionSolver&) = delete; - - public: //- Runtime type information @@ -111,6 +99,12 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + displacementInterpolationMotionSolver + ( + const displacementInterpolationMotionSolver& + ); + //- Destructor ~displacementInterpolationMotionSolver(); @@ -124,6 +118,12 @@ public: //- Solve for motion virtual void solve() {} + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const displacementInterpolationMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H index 721651077f..a1420558cb 100644 --- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H @@ -111,16 +111,6 @@ class displacementLayeredMotionMotionSolver ); - //- Disallow default bitwise copy construction - displacementLayeredMotionMotionSolver - ( - const displacementLayeredMotionMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const displacementLayeredMotionMotionSolver&) = delete; - - public: //- Runtime type information @@ -136,6 +126,12 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + displacementLayeredMotionMotionSolver + ( + const displacementLayeredMotionMotionSolver& + ); + //- Destructor ~displacementLayeredMotionMotionSolver(); @@ -151,6 +147,12 @@ public: //- Update topology virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const displacementLayeredMotionMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.H index 4c68a5ba5b..d8063b31d7 100644 --- a/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.H @@ -88,16 +88,6 @@ class displacementLinearMotionMotionSolver autoPtr> displacement_; - //- Disallow default bitwise copy construction - displacementLinearMotionMotionSolver - ( - const displacementLinearMotionMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const displacementLinearMotionMotionSolver&) = delete; - - public: //- Runtime type information @@ -113,6 +103,12 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + displacementLinearMotionMotionSolver + ( + const displacementLinearMotionMotionSolver& + ); + //- Destructor ~displacementLinearMotionMotionSolver(); @@ -126,6 +122,12 @@ public: //- Solve for motion virtual void solve() {} + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const displacementLinearMotionMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H index c05273501b..f70d65c47d 100644 --- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H @@ -62,16 +62,6 @@ protected: pointIOField points0_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - points0MotionSolver(const points0MotionSolver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const points0MotionSolver&) = delete; - public: //- Runtime type information @@ -88,6 +78,9 @@ public: const word& type ); + //- Disallow default bitwise copy construction + points0MotionSolver(const points0MotionSolver&) = delete; + //- Destructor virtual ~points0MotionSolver(); @@ -112,6 +105,12 @@ public: //- Update local data for topology changes virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const points0MotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/interpolatingSolidBodyMotionSolver/interpolatingSolidBodyMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/interpolatingSolidBodyMotionSolver/interpolatingSolidBodyMotionSolver.H index 9f4c7043cb..2629fdd602 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/interpolatingSolidBodyMotionSolver/interpolatingSolidBodyMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/interpolatingSolidBodyMotionSolver/interpolatingSolidBodyMotionSolver.H @@ -76,18 +76,6 @@ class interpolatingSolidBodyMotionSolver pointScalarField scale_; - // Private Member Functions - - //- Disallow default bitwise copy construction - interpolatingSolidBodyMotionSolver - ( - const interpolatingSolidBodyMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const interpolatingSolidBodyMotionSolver&) = delete; - - public: //- Runtime type information @@ -103,6 +91,12 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + interpolatingSolidBodyMotionSolver + ( + const interpolatingSolidBodyMotionSolver& + ); + //- Destructor ~interpolatingSolidBodyMotionSolver(); @@ -116,6 +110,12 @@ public: //- Solve for motion virtual void solve() {} + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const interpolatingSolidBodyMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.H index 44918bd157..19c88914dc 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver/multiSolidBodyMotionSolver.H @@ -64,15 +64,6 @@ class multiSolidBodyMotionSolver labelListList pointIDs_; - // Private Member Functions - - //- Disallow default bitwise copy construction - multiSolidBodyMotionSolver(const multiSolidBodyMotionSolver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const multiSolidBodyMotionSolver&) = delete; - - public: //- Runtime type information @@ -88,6 +79,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + multiSolidBodyMotionSolver(const multiSolidBodyMotionSolver&) = delete; + //- Destructor ~multiSolidBodyMotionSolver(); @@ -101,6 +95,12 @@ public: //- Solve for motion virtual void solve() {} + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const multiSolidBodyMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H index 8c6ef70060..3a89e92925 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H @@ -94,15 +94,6 @@ class SDA scalar dTp_; - // Private Member Functions - - //- Disallow default bitwise copy construction - SDA(const SDA&); - - //- Disallow default bitwise assignment - void operator=(const SDA&) = delete; - - public: //- Runtime type information @@ -118,6 +109,10 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + SDA(const SDA&); + + //- Construct and return a clone virtual autoPtr clone() const { @@ -143,6 +138,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const SDA&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H index bb76ffd3d3..fa5ac5f136 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H @@ -64,15 +64,6 @@ class axisRotationMotion vector radialVelocity_; - // Private Member Functions - - //- Disallow default bitwise copy construction - axisRotationMotion(const axisRotationMotion&); - - //- Disallow default bitwise assignment - void operator=(const axisRotationMotion&) = delete; - - public: //- Runtime type information @@ -88,6 +79,9 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + axisRotationMotion(const axisRotationMotion&); + //- Construct and return a clone virtual autoPtr clone() const { @@ -113,6 +107,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const axisRotationMotion&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H index 582f2d914e..0f19e81f1b 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H @@ -60,15 +60,6 @@ class linearMotion vector velocity_; - // Private Member Functions - - //- Disallow default bitwise copy construction - linearMotion(const linearMotion&); - - //- Disallow default bitwise assignment - void operator=(const linearMotion&) = delete; - - public: //- Runtime type information @@ -84,6 +75,10 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + linearMotion(const linearMotion&); + + //- Construct and return a clone virtual autoPtr clone() const { @@ -109,6 +104,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const linearMotion&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H index 0ca55bf9c8..a295d0e2b1 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H @@ -60,15 +60,6 @@ class multiMotion PtrList SBMFs_; - // Private Member Functions - - //- Disallow default bitwise copy construction - multiMotion(const multiMotion&); - - //- Disallow default bitwise assignment - void operator=(const multiMotion&) = delete; - - public: //- Runtime type information @@ -84,6 +75,9 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + multiMotion(const multiMotion&); + //- Construct and return a clone virtual autoPtr clone() const { @@ -109,6 +103,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const multiMotion&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H index 418c228df6..c1a49127a4 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H @@ -63,15 +63,6 @@ class oscillatingLinearMotion scalar omega_; - // Private Member Functions - - //- Disallow default bitwise copy construction - oscillatingLinearMotion(const oscillatingLinearMotion&); - - //- Disallow default bitwise assignment - void operator=(const oscillatingLinearMotion&) = delete; - - public: //- Runtime type information @@ -87,6 +78,9 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + oscillatingLinearMotion(const oscillatingLinearMotion&); + //- Construct and return a clone virtual autoPtr clone() const { @@ -112,6 +106,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const oscillatingLinearMotion&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H index bc2304186c..2f5c0f427d 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H @@ -66,15 +66,6 @@ class oscillatingRotatingMotion scalar omega_; - // Private Member Functions - - //- Disallow default bitwise copy construction - oscillatingRotatingMotion(const oscillatingRotatingMotion&); - - //- Disallow default bitwise assignment - void operator=(const oscillatingRotatingMotion&) = delete; - - public: //- Runtime type information @@ -90,6 +81,9 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + oscillatingRotatingMotion(const oscillatingRotatingMotion&); + //- Construct and return a clone virtual autoPtr clone() const { @@ -115,6 +109,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const oscillatingRotatingMotion&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H index ff5bf6dd7e..36520b9f3e 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H @@ -71,15 +71,6 @@ class rotatingMotion autoPtr> omega_; - // Private Member Functions - - //- Disallow default bitwise copy construction - rotatingMotion(const rotatingMotion&); - - //- Disallow default bitwise assignment - void operator=(const rotatingMotion&) = delete; - - public: //- Runtime type information @@ -95,6 +86,10 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + rotatingMotion(const rotatingMotion&); + + //- Construct and return a clone virtual autoPtr clone() const { @@ -120,6 +115,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const rotatingMotion&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H index 7ec5c5bff6..c13ad78d5f 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H @@ -68,17 +68,6 @@ protected: const Time& time_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - solidBodyMotionFunction(const solidBodyMotionFunction&) = delete; - - //- Disallow default bitwise assignment - void operator=(const solidBodyMotionFunction&) = delete; - - public: //- Runtime type information @@ -106,6 +95,9 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + solidBodyMotionFunction(const solidBodyMotionFunction&) = delete; + //- Construct and return a clone virtual autoPtr clone() const = 0; @@ -134,6 +126,12 @@ public: //- Write in dictionary format virtual void writeData(Ostream&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const solidBodyMotionFunction&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H index b56643715c..da82a48c9a 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H @@ -76,15 +76,6 @@ class tabulated6DoFMotion Field values_; - // Private Member Functions - - //- Disallow default bitwise copy construction - tabulated6DoFMotion(const tabulated6DoFMotion&); - - //- Disallow default bitwise assignment - void operator=(const tabulated6DoFMotion&) = delete; - - public: //- Runtime type information @@ -100,6 +91,10 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + tabulated6DoFMotion(const tabulated6DoFMotion&); + + //- Construct and return a clone virtual autoPtr clone() const { @@ -125,6 +120,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& SBMFCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const tabulated6DoFMotion&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H index a0adf94f9d..2a1c593d68 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver/solidBodyMotionSolver.H @@ -64,15 +64,6 @@ class solidBodyMotionSolver bool moveAllCells_; - // Private Member Functions - - //- Disallow default bitwise copy construction - solidBodyMotionSolver(const solidBodyMotionSolver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const solidBodyMotionSolver&) = delete; - - public: //- Runtime type information @@ -88,6 +79,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + solidBodyMotionSolver(const solidBodyMotionSolver&) = delete; + //- Destructor ~solidBodyMotionSolver(); @@ -101,6 +95,12 @@ public: //- Solve for motion virtual void solve() {} + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const solidBodyMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H index 10b61b08d5..f9ae78880f 100644 --- a/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H +++ b/src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H @@ -59,15 +59,6 @@ class motionSolverList PtrList motionSolvers_; - // Private Member Functions - - //- Disallow default bitwise copy construction - motionSolverList(const motionSolverList&) = delete; - - //- Disallow default bitwise assignment - void operator=(const motionSolverList&) = delete; - - public: //- Runtime type information @@ -79,6 +70,9 @@ public: //- Construct from mesh and dictionary motionSolverList(const polyMesh&, const dictionary&); + //- Disallow default bitwise copy construction + motionSolverList(const motionSolverList&) = delete; + //- Destructor virtual ~motionSolverList(); @@ -97,6 +91,12 @@ public: //- Update local data for topology changes virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const motionSolverList&) = delete; }; diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H index 0f242e3e08..494a25b889 100644 --- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H @@ -63,18 +63,6 @@ protected: //- Point motion field mutable pointVectorField pointMotionU_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - velocityMotionSolver - ( - const velocityMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const velocityMotionSolver&) = delete; public: @@ -92,6 +80,12 @@ public: const word& type ); + //- Disallow default bitwise copy construction + velocityMotionSolver + ( + const velocityMotionSolver& + ); + //- Destructor virtual ~velocityMotionSolver(); @@ -116,6 +110,12 @@ public: //- Update local data for topology changes virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const velocityMotionSolver&) = delete; }; diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.H b/src/dynamicMesh/perfectInterface/perfectInterface.H index 77f4f9b893..d7cf1eb250 100644 --- a/src/dynamicMesh/perfectInterface/perfectInterface.H +++ b/src/dynamicMesh/perfectInterface/perfectInterface.H @@ -78,13 +78,6 @@ class perfectInterface static pointField calcFaceCentres(const indirectPrimitivePatch&); - //- Disallow default bitwise copy construction - perfectInterface(const perfectInterface&) = delete; - - //- Disallow default bitwise assignment - void operator=(const perfectInterface&) = delete; - - public: //- Runtime type information @@ -113,6 +106,9 @@ public: const polyTopoChanger& mme ); + //- Disallow default bitwise copy construction + perfectInterface(const perfectInterface&) = delete; + //- Destructor virtual ~perfectInterface(); @@ -150,6 +146,11 @@ public: //- Write dictionary virtual void writeDict(Ostream&) const; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const perfectInterface&) = delete; }; diff --git a/src/dynamicMesh/pointPatchDist/pointPatchDist.H b/src/dynamicMesh/pointPatchDist/pointPatchDist.H index 74d9a1d405..f780198f30 100644 --- a/src/dynamicMesh/pointPatchDist/pointPatchDist.H +++ b/src/dynamicMesh/pointPatchDist/pointPatchDist.H @@ -64,15 +64,6 @@ class pointPatchDist label nUnset_; - // Private Member Functions - - //- Disallow default bitwise copy construction - pointPatchDist(const pointPatchDist&) = delete; - - //- Disallow default bitwise assignment - void operator=(const pointPatchDist&) = delete; - - public: // Constructors @@ -85,6 +76,9 @@ public: const pointField& points ); + //- Disallow default bitwise copy construction + pointPatchDist(const pointPatchDist&) = delete; + //- Destructor virtual ~pointPatchDist(); @@ -104,6 +98,12 @@ public: //- Correct for mesh geom/topo changes void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const pointPatchDist&) = delete; }; diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H index 304e7d1005..7c78cf40c2 100644 --- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H +++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H @@ -186,12 +186,6 @@ class polyMeshFilter labelList& origToCurrentPointMap ) const; - //- Disallow default bitwise copy construction - polyMeshFilter(const polyMeshFilter&) = delete; - - //- Disallow default bitwise assignment - void operator=(const polyMeshFilter&) = delete; - public: @@ -215,6 +209,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + polyMeshFilter(const polyMeshFilter&) = delete; + //- Destructor ~polyMeshFilter(); @@ -255,6 +252,12 @@ public: //- Filter edges only. label filterEdges(const label nOriginalBadFaces); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const polyMeshFilter&) = delete; }; diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H index c873f47312..5861c92026 100644 --- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H +++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H @@ -61,17 +61,6 @@ class attachPolyTopoChanger : public polyTopoChanger { - // Private Data - - // Private Member Functions - - //- Disallow default bitwise copy construction - attachPolyTopoChanger(const attachPolyTopoChanger&) = delete; - - //- Disallow default bitwise assignment - void operator=(const attachPolyTopoChanger&) = delete; - - public: // Constructors @@ -82,6 +71,9 @@ public: //- Read constructor for given polyMesh explicit attachPolyTopoChanger(polyMesh&); + //- Disallow default bitwise copy construction + attachPolyTopoChanger(const attachPolyTopoChanger&) = delete; + //- Destructor virtual ~attachPolyTopoChanger() @@ -92,6 +84,12 @@ public: //- Attach mesh. By default filter out empty patches. void attach(const bool removeEmptyPatches = true); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const attachPolyTopoChanger&) = delete; }; diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H index fd4a5a4ebe..706f6bcfa2 100644 --- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H +++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H @@ -84,15 +84,6 @@ class polyMeshModifier mutable Switch active_; - // Private Member Functions - - //- Disallow default bitwise copy construction - polyMeshModifier(const polyMeshModifier&) = delete; - - //- Disallow default bitwise assignment - void operator=(const polyMeshModifier&) = delete; - - public: // Static Data Members @@ -129,6 +120,9 @@ public: const bool act ); + //- Disallow default bitwise copy construction + polyMeshModifier(const polyMeshModifier&) = delete; + // Selectors @@ -203,6 +197,12 @@ public: virtual void writeDict(Ostream&) const = 0; + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const polyMeshModifier&) = delete; + + // Ostream Operator friend Ostream& operator<<(Ostream&, const polyMeshModifier&); diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H index bf41b82a14..23191d4c4b 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H @@ -243,12 +243,6 @@ class addPatchCellLayer bool& ); - //- Disallow default bitwise copy construction - addPatchCellLayer(const addPatchCellLayer&) = delete; - - //- Disallow default bitwise assignment - void operator=(const addPatchCellLayer&) = delete; - public: @@ -261,6 +255,9 @@ public: //- Construct from mesh. addPatchCellLayer(const polyMesh&, const bool addToMesh = true); + //- Disallow default bitwise copy construction + addPatchCellLayer(const addPatchCellLayer&) = delete; + // Member Functions @@ -393,6 +390,12 @@ public: const labelList& faceMap, // new to old patch faces const labelList& pointMap // new to old patch points ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const addPatchCellLayer&) = delete; }; diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H index 88d8c04f39..dd272ce80e 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H @@ -115,13 +115,6 @@ class combineFaces ) const; - - //- Disallow default bitwise copy construction - combineFaces(const combineFaces&) = delete; - - //- Disallow default bitwise assignment - void operator=(const combineFaces&) = delete; - public: //- Runtime type information @@ -133,6 +126,9 @@ public: //- Construct from mesh combineFaces(const polyMesh& mesh, const bool undoable = false); + //- Disallow default bitwise copy construction + combineFaces(const combineFaces&) = delete; + // Member Functions @@ -215,6 +211,12 @@ public: Map