From f7ea836c6576d894626315374e067a5ad7000ff9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Wed, 29 May 2019 15:48:49 +0100
Subject: [PATCH] src/OpenFOAM: Moved the deleted bitwise copy and assignment
 declarations into public section of the class

---
 src/OpenFOAM/algorithms/subCycle/subCycle.H   | 17 +++----
 .../HashTables/HashTable/HashTable.H          |  2 -
 .../linkTypes/DLListBase/DLListBase.H         | 18 ++++----
 .../linkTypes/SLListBase/SLListBase.H         | 18 ++++----
 .../containers/Lists/Histogram/Histogram.H    | 17 ++++---
 .../Lists/IndirectList/IndirectList.H         | 18 ++++----
 src/OpenFOAM/db/Callback/Callback.H           | 12 ++---
 .../db/CallbackRegistry/CallbackRegistry.H    | 17 +++----
 src/OpenFOAM/db/IOobjectList/IOobjectList.H   | 11 ++---
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H |  9 ++--
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H | 12 ++---
 .../db/IOstreams/hashes/OSHA1stream.H         | 20 ++++-----
 src/OpenFOAM/db/IOstreams/token/token.H       | 45 ++++++++-----------
 .../functionEntries/calcEntry/calcEntry.H     | 21 +++++----
 .../functionEntries/codeStream/codeStream.H   | 18 +++++---
 .../functionEntry/functionEntry.H             | 15 ++++---
 .../functionEntries/ifEntry/ifEntry.H         | 19 +++++---
 .../functionEntries/ifeqEntry/ifeqEntry.H     | 24 +++++-----
 .../includeEntry/includeEntry.H               | 19 +++++---
 .../includeEtcEntry/includeEtcEntry.H         | 18 +++++---
 .../includeIfPresentEntry.H                   | 18 +++++---
 .../inputModeEntry/inputModeEntry.H           | 18 +++++---
 .../functionEntries/negEntry/negEntry.H       | 18 +++++---
 .../functionEntries/removeEntry/removeEntry.H | 20 +++++----
 .../db/dynamicLibrary/codedBase/codedBase.H   | 15 ++++---
 .../dlLibraryTable/dlLibraryTable.H           | 16 ++++---
 .../dynamicLibrary/dynamicCode/dynamicCode.H  | 17 ++++---
 .../IOOutputFilter/IOOutputFilter.H           | 15 ++++---
 .../functionObject/functionObject.H           | 18 ++++----
 .../functionObjectList/functionObjectList.H   | 15 ++++---
 .../db/functionObjects/logFiles/logFiles.H    | 20 ++++-----
 .../regionFunctionObject.H                    | 20 ++++-----
 .../functionObjects/timeControl/timeControl.H | 18 ++++----
 .../timeControl/timeControlFunctionObject.H   | 15 ++++---
 .../db/functionObjects/writeFile/writeFile.H  | 20 ++++-----
 .../writeLocalObjects/writeLocalObjects.H     | 20 ++++-----
 .../writeObjectsBase/writeObjectsBase.H       | 20 ++++-----
 .../db/objectRegistry/objectRegistry.H        | 15 ++++---
 .../SlicedGeometricField.H                    | 34 ++++++++------
 src/OpenFOAM/fields/cloud/cloud.H             | 18 ++++----
 .../pointPatchFieldMapperPatchRef.H           | 24 +++++-----
 .../interpolationWeights.H                    | 18 ++++----
 .../PatchToPatchInterpolation.H               | 14 +++---
 .../PrimitivePatchInterpolation.H             | 22 ++++-----
 .../uniformInterpolationTable.H               |  9 ++--
 .../LduInterfaceField/LduInterfaceField.H     | 17 +++----
 .../DiagonalPreconditioner.H                  | 18 ++++----
 .../NoPreconditioner/NoPreconditioner.H       | 17 +++----
 .../Solvers/DiagonalSolver/DiagonalSolver.H   | 17 +++----
 .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.H       | 17 +++----
 .../LduMatrix/Solvers/PBiCICG/PBiCICG.H       | 17 +++----
 .../matrices/LduMatrix/Solvers/PCICG/PCICG.H  | 17 +++----
 .../lduMatrix/lduAddressing/lduAddressing.H   | 32 +++++++------
 .../lduAddressing/lduInterface/lduInterface.H | 17 +++----
 .../lduInterfaceField/lduInterfaceField.H     | 18 ++++----
 .../FDICPreconditioner/FDICPreconditioner.H   | 18 ++++----
 .../diagonalPreconditioner.H                  | 18 ++++----
 .../noPreconditioner/noPreconditioner.H       | 17 +++----
 .../GAMGAgglomeration/GAMGAgglomeration.H     | 20 ++++-----
 .../dummyAgglomeration/dummyAgglomeration.H   | 19 ++++----
 .../pairGAMGAgglomeration.H                   | 15 ++++---
 .../GAMGProcAgglomeration.H                   | 20 ++++-----
 .../eagerGAMGProcAgglomeration.H              | 22 ++++-----
 .../manualGAMGProcAgglomeration.H             | 23 +++++-----
 .../masterCoarsestGAMGProcAgglomeration.H     | 23 +++++-----
 .../noneGAMGProcAgglomeration.H               | 22 ++++-----
 .../procFacesGAMGProcAgglomeration.H          | 20 +++++----
 .../GAMGInterfaceField/GAMGInterfaceField.H   | 17 ++++---
 .../cyclicGAMGInterfaceField.H                | 18 ++++----
 .../processorGAMGInterfaceField.H             | 25 +++++------
 .../interfaces/GAMGInterface/GAMGInterface.H  | 20 ++++-----
 .../cyclicGAMGInterface/cyclicGAMGInterface.H | 18 ++++----
 .../processorCyclicGAMGInterface.H            | 22 ++++-----
 .../processorGAMGInterface.H                  | 18 ++++----
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.H  | 17 +++----
 .../lduMatrix/solvers/PBiCGStab/PBiCGStab.H   | 17 +++----
 .../matrices/lduMatrix/solvers/PCG/PCG.H      | 17 +++----
 .../solvers/diagonalSolver/diagonalSolver.H   | 17 +++----
 .../matrices/scalarMatrices/SVD/SVD.H         | 15 ++++---
 src/OpenFOAM/matrices/solution/solution.H     | 12 +++--
 src/OpenFOAM/matrices/tolerances/tolerances.H | 15 ++++---
 src/OpenFOAM/meshes/Residuals/Residuals.H     | 18 ++++----
 .../meshes/lduMesh/lduPrimitiveMesh.H         | 15 ++++---
 .../meshShapes/cellMatcher/cellMatcher.H      | 16 +++----
 .../meshShapes/cellMatcher/hexMatcher.H       | 19 ++++----
 .../meshShapes/cellMatcher/prismMatcher.H     | 19 ++++----
 .../meshShapes/cellMatcher/pyrMatcher.H       | 19 ++++----
 .../meshShapes/cellMatcher/tetMatcher.H       | 19 ++++----
 .../meshShapes/cellMatcher/tetWedgeMatcher.H  | 19 ++++----
 .../meshShapes/cellMatcher/wedgeMatcher.H     | 19 ++++----
 .../pointBoundaryMesh/pointBoundaryMesh.H     | 15 ++++---
 src/OpenFOAM/meshes/pointMesh/pointMesh.H     | 12 ++---
 .../pointMeshMapper/pointBoundaryMeshMapper.H | 17 +++----
 .../pointMesh/pointMeshMapper/pointMapper.H   | 16 ++++---
 .../pointMeshMapper/pointMeshMapper.H         | 18 ++++----
 .../pointMeshMapper/pointPatchMapper.H        | 22 ++++-----
 .../facePointPatch/facePointPatch.H           | 20 ++++-----
 .../pointPatches/pointPatch/pointPatch.H      | 18 ++++----
 .../polyMesh/globalMeshData/globalMeshData.H  | 16 ++++---
 .../polyMesh/globalMeshData/globalPoints.H    | 15 ++++---
 .../mapPolyMesh/cellMapper/cellMapper.H       | 16 ++++---
 .../mapPolyMesh/faceMapper/faceMapper.H       | 16 ++++---
 .../mapDistribute/mapDistributePolyMesh.H     |  7 +--
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H | 18 ++++----
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       | 15 ++++---
 .../meshes/polyMesh/zones/cellZone/cellZone.H | 12 ++---
 .../meshes/polyMesh/zones/faceZone/faceZone.H | 10 ++---
 .../polyMesh/zones/pointZone/pointZone.H      |  8 ++--
 .../meshes/polyMesh/zones/zone/zone.H         |  6 +--
 .../meshes/primitiveMesh/primitiveMesh.H      | 18 ++++----
 .../primitiveMesh/primitivePatch/walkPatch.H  | 14 +++---
 .../primitives/functions/Function1/CSV/CSV.H  |  9 ++--
 .../functions/Function1/Constant/Constant.H   | 12 ++---
 .../functions/Function1/Function1/Function1.H | 11 ++---
 .../functions/Function1/One/OneConstant.H     | 11 ++---
 .../PolynomialEntry/PolynomialEntry.H         | 12 ++---
 .../functions/Function1/Scale/Scale.H         |  9 ++--
 .../functions/Function1/Sine/Sine.H           |  9 ++--
 .../functions/Function1/Square/Square.H       |  9 ++--
 .../functions/Function1/Table/Table.H         | 11 ++---
 .../functions/Function1/TableFile/TableFile.H | 12 ++---
 .../functions/Function1/Uniform/Uniform.H     | 11 ++---
 .../functions/Function1/Zero/ZeroConstant.H   | 11 ++---
 .../Function1/halfCosineRamp/halfCosineRamp.H | 11 ++---
 .../Function1/linearRamp/linearRamp.H         | 11 ++---
 .../Function1/quadraticRamp/quadraticRamp.H   | 11 ++---
 .../quarterCosineRamp/quarterCosineRamp.H     | 11 ++---
 .../quarterSineRamp/quarterSineRamp.H         | 11 ++---
 .../functions/Function1/ramp/ramp.H           |  9 ++--
 .../globalIndexAndTransform.H                 | 14 +++---
 .../primitives/nullObject/nullObject.H        | 10 ++---
 .../primitives/subModelBase/subModelBase.H    | 11 ++---
 132 files changed, 1155 insertions(+), 1022 deletions(-)

diff --git a/src/OpenFOAM/algorithms/subCycle/subCycle.H b/src/OpenFOAM/algorithms/subCycle/subCycle.H
index 6b1f980bbc..0da4796276 100644
--- a/src/OpenFOAM/algorithms/subCycle/subCycle.H
+++ b/src/OpenFOAM/algorithms/subCycle/subCycle.H
@@ -211,14 +211,6 @@ class subCycle
     public SubCycleField<GeometricField>,
     public subCycleTime
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        subCycle(const subCycle<GeometricField>&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const subCycle<GeometricField>&) = delete;
-
 
 public:
 
@@ -238,6 +230,9 @@ public:
             this->updateTimeIndex();
         }
 
+        //- Disallow default bitwise copy construct
+        subCycle(const subCycle<GeometricField>&) = delete;
+
 
     //- Destructor
     //  End the subCycleTime, which restores the time state
@@ -245,6 +240,12 @@ public:
     {
         endSubCycle();
     }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const subCycle<GeometricField>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 0eb7a92dfb..ab10c50e7e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -143,8 +143,6 @@ class HashTable
             //- Construct from key, next pointer and object
             inline hashedEntry(const Key&, hashedEntry* next, const T&);
 
-
-        private:
             //- Disallow default bitwise copy construct
             hashedEntry(const hashedEntry&) = delete;
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index a7ce412c77..6ee464d7b8 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -81,15 +81,6 @@ private:
        label nElmts_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        DLListBase(const DLListBase&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const DLListBase&) = delete;
-
-
 public:
 
     // Forward declaration of STL iterators
@@ -112,6 +103,9 @@ public:
         //- Construct given initial entry
         inline DLListBase(link*);
 
+        //- Disallow default bitwise copy construct
+        DLListBase(const DLListBase&) = delete;
+
 
     //- Destructor
     ~DLListBase();
@@ -177,6 +171,12 @@ public:
             inline void transfer(DLListBase&);
 
 
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const DLListBase&) = delete;
+
+
     // STL iterator
 
         //- An STL-conforming iterator
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index a086a9293d..ebcd071dcb 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -78,14 +78,6 @@ private:
        //- Number of elements in in list
        label nElmts_;
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        SLListBase(const SLListBase&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const SLListBase&) = delete;
-
 
 public:
 
@@ -106,6 +98,9 @@ public:
         //- Construct given initial entry
         inline SLListBase(link*);
 
+        //- Disallow default bitwise copy construct
+        SLListBase(const SLListBase&) = delete;
+
 
     //- Destructor
     ~SLListBase();
@@ -158,6 +153,13 @@ public:
             //  and annul the argument list.
             inline void transfer(SLListBase&);
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SLListBase&) = delete;
+
+
     // STL iterator
 
         //- An STL-conforming iterator
diff --git a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
index d8e13c4e3d..0e318e7cdd 100644
--- a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
+++ b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
@@ -66,12 +66,6 @@ class Histogram
 
         void count(const List& bins, const List& l);
 
-        //- Disallow default bitwise copy construct
-        Histogram(const Histogram&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const Histogram&) = delete;
-
 
 public:
 
@@ -89,8 +83,11 @@ public:
             const List& l
         );
 
+        //- Disallow default bitwise copy construct
+        Histogram(const Histogram&) = delete;
 
-        // Access
+
+    // Member Functions
 
             //- Return the counts per bin
             inline const labelList& counts() const
@@ -111,6 +108,12 @@ public:
             {
                 return nHigh_;
             }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Histogram&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 51e088667b..54de934da5 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -59,15 +59,6 @@ class IndirectListAddressing
         List<label> addressing_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        IndirectListAddressing(const IndirectListAddressing&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const IndirectListAddressing&) = delete;
-
-
 protected:
 
     // Constructors
@@ -78,6 +69,9 @@ protected:
         //- Move constructor which moves the addressing array
         explicit inline IndirectListAddressing(List<label>&& addr);
 
+        //- Disallow default bitwise copy construct
+        IndirectListAddressing(const IndirectListAddressing&) = delete;
+
 
     // Member Functions
 
@@ -91,6 +85,12 @@ protected:
 
             //- Reset addressing
             inline void resetAddressing(const labelUList&);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const IndirectListAddressing&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/Callback/Callback.H b/src/OpenFOAM/db/Callback/Callback.H
index dc9b6fc00d..37b0fe3a7b 100644
--- a/src/OpenFOAM/db/Callback/Callback.H
+++ b/src/OpenFOAM/db/Callback/Callback.H
@@ -59,12 +59,6 @@ class Callback
         CallbackRegistry<CallbackType>& cbr_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const Callback<CallbackType>&) = delete;
-
-
 public:
 
     // Constructors
@@ -89,6 +83,12 @@ public:
 
             //- Check-out Callback from CallbackRegistry
             bool checkOut();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Callback<CallbackType>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
index 212b5697d7..0aa26530ac 100644
--- a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
+++ b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
@@ -69,14 +69,6 @@ class CallbackRegistry
     public CallbackRegistryName,
     public UIDLList<CallbackType>
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        CallbackRegistry(const CallbackRegistry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const CallbackRegistry&) = delete;
-
 
 public:
 
@@ -85,9 +77,18 @@ public:
         //- Construct null
         CallbackRegistry();
 
+        //- Disallow default bitwise copy construct
+        CallbackRegistry(const CallbackRegistry&) = delete;
+
 
     //- Destructor
     virtual ~CallbackRegistry();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const CallbackRegistry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.H b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
index 78df222017..a3a095c8a8 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
@@ -52,11 +52,6 @@ class IOobjectList
 :
     public HashPtrTable<IOobject>
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const IOobjectList&) = delete;
-
 
 public:
 
@@ -115,6 +110,12 @@ public:
 
         //- Return the sorted list of names of the IOobjects of given class
         wordList sortedNames(const word& className) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const IOobjectList&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index 8232f115b8..21b68dca3f 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -74,9 +74,6 @@ class ISstream
         //- Read a variable name (includes '{')
         Istream& readVariable(string&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const ISstream&) = delete;
-
 
 public:
 
@@ -195,6 +192,12 @@ public:
 
             //- Print description of IOstream to Ostream
             virtual void print(Ostream&) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const ISstream&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index bccb6bc7ee..ba7e199186 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -59,12 +59,6 @@ class OSstream
         ostream& os_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const OSstream&) = delete;
-
-
 public:
 
     // Constructors
@@ -195,6 +189,12 @@ public:
 
             //- Print description of IOstream to Ostream
             virtual void print(Ostream&) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const OSstream&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
index 8cc04ab91c..65d8ef3c7b 100644
--- a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
+++ b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
@@ -136,14 +136,6 @@ class OSHA1stream
     public OSstream
 {
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        OSHA1stream(const OSHA1stream&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const OSHA1stream&) = delete;
-
 public:
 
     // Constructors
@@ -164,6 +156,9 @@ public:
             )
         {}
 
+        //- Disallow default bitwise copy construct
+        OSHA1stream(const OSHA1stream&) = delete;
+
 
     //- Destructor
     ~OSHA1stream()
@@ -174,8 +169,6 @@ public:
 
     // Member functions
 
-    // Access
-
         //- Full access to the sha1
         Foam::SHA1& sha1()
         {
@@ -188,14 +181,17 @@ public:
             return sha1().digest();
         }
 
-    // Edit
-
         //- Clear the SHA1 calculation
         void rewind()
         {
             sha1().clear();
         }
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const OSHA1stream&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index d9ee70b73a..f548ec1733 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -130,15 +130,6 @@ public:
             bool empty_;
 
 
-        // Private Member Functions
-
-            //- Disallow default bitwise copy construct
-            compound(const compound&) = delete;
-
-            //- Disallow default bitwise assignment
-            void operator=(const compound&) = delete;
-
-
     public:
 
         //- Runtime type information
@@ -164,6 +155,9 @@ public:
                 empty_(false)
             {}
 
+            //- Disallow default bitwise copy construct
+            compound(const compound&) = delete;
+
 
         // Selectors
 
@@ -177,31 +171,28 @@ public:
 
         // Member Functions
 
-            // Access
+            //- Return true if name is a compound type
+            static bool isCompound(const word& name);
 
-                //- Return true if name is a compound type
-                static bool isCompound(const word& name);
+            bool empty() const
+            {
+                return empty_;
+            }
 
-                bool empty() const
-                {
-                    return empty_;
-                }
+            bool& empty()
+            {
+                return empty_;
+            }
 
-                bool& empty()
-                {
-                    return empty_;
-                }
+            virtual label size() const = 0;
 
-                virtual label size() const = 0;
+            virtual void write(Ostream&) const = 0;
 
 
-            // Check
+        // Member Operators
 
-            // Edit
-
-            // Write
-
-                virtual void write(Ostream&) const = 0;
+            //- Disallow default bitwise assignment
+            void operator=(const compound&) = delete;
 
 
         // IOstream Operators
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.H
index fcd8d3ffdd..265135f642 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.H
@@ -57,6 +57,7 @@ SourceFiles
 
 namespace Foam
 {
+
 class dlLibraryTable;
 
 namespace functionEntries
@@ -71,21 +72,18 @@ class calcEntry
     public functionEntry
 {
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        calcEntry(const calcEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const calcEntry&) = delete;
-
-
 public:
 
     //- Runtime type information
     ClassName("calc");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        calcEntry(const calcEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
@@ -99,6 +97,11 @@ public:
             Istream&
         );
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const calcEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
index 02ecfed29a..0ebcd727ca 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
@@ -138,13 +138,6 @@ class codeStream
         );
 
 
-        //- Disallow default bitwise copy construct
-        codeStream(const codeStream&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const codeStream&) = delete;
-
-
 public:
 
     // Static data members
@@ -162,6 +155,12 @@ public:
     ClassName("codeStream");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        codeStream(const codeStream&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
@@ -175,6 +174,11 @@ public:
             Istream&
         );
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const codeStream&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H
index c65e68c06d..07a77b9023 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H
@@ -70,12 +70,6 @@ class functionEntry
         //- Read line as string token
         static token readLine(const word& key, Istream& is);
 
-        //- Disallow default bitwise copy construct
-        functionEntry(const functionEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const functionEntry&) = delete;
-
 
 public:
 
@@ -84,6 +78,9 @@ public:
         //- Construct from keyword, parent dictionary and Istream
         functionEntry(const word&, const dictionary&, Istream&);
 
+        //- Disallow default bitwise copy construct
+        functionEntry(const functionEntry&) = delete;
+
 
     // Member Function Selectors
 
@@ -133,6 +130,12 @@ public:
 
         //- Write
         virtual void write(Ostream&) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const functionEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/ifEntry/ifEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/ifEntry/ifEntry.H
index d79256f954..a8f14fb221 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/ifEntry/ifEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/ifEntry/ifEntry.H
@@ -84,22 +84,29 @@ class ifEntry
             Istream& is
         );
 
-        //- Disallow default bitwise copy construct
-        ifEntry(const ifEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const ifEntry&) = delete;
-
 
 public:
 
     //- Runtime type information
     ClassName("if");
 
+
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        ifEntry(const ifEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
         static bool execute(dictionary& parentDict, Istream& is);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const ifEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/ifeqEntry/ifeqEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/ifeqEntry/ifeqEntry.H
index 6bc340badf..d207e47bc4 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/ifeqEntry/ifeqEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/ifeqEntry/ifeqEntry.H
@@ -155,26 +155,28 @@ protected:
         );
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        ifeqEntry(const ifeqEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const ifeqEntry&) = delete;
-
-
 public:
 
     //- Runtime type information
     ClassName("ifeq");
 
+
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        ifeqEntry(const ifeqEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
         static bool execute(dictionary& parentDict, Istream& is);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const ifeqEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
index 8a53faca87..dff78e49c7 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
@@ -64,13 +64,6 @@ class includeEntry
 :
     public functionEntry
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        includeEntry(const includeEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const includeEntry&) = delete;
 
 protected:
 
@@ -87,6 +80,7 @@ protected:
             const dictionary&
         );
 
+
 public:
 
     // Static data members
@@ -99,6 +93,12 @@ public:
     ClassName("include");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        includeEntry(const includeEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
@@ -112,6 +112,11 @@ public:
             Istream&
         );
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const includeEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H
index 4dd7084413..dde1685720 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H
@@ -81,12 +81,6 @@ class includeEtcEntry
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        includeEtcEntry(const includeEtcEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const includeEtcEntry&) = delete;
-
         //- Expand include fileName and return
         static fileName includeEtcFileName
         (
@@ -107,6 +101,12 @@ public:
     ClassName("includeEtc");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        includeEtcEntry(const includeEtcEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
@@ -119,6 +119,12 @@ public:
             primitiveEntry&,
             Istream&
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const includeEtcEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.H
index ae9ca679b1..6af783f768 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.H
@@ -58,13 +58,6 @@ class includeIfPresentEntry
 :
     public includeEntry
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        includeIfPresentEntry(const includeIfPresentEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const includeIfPresentEntry&) = delete;
 
 public:
 
@@ -72,6 +65,12 @@ public:
     ClassName("includeIfPresent");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        includeIfPresentEntry(const includeIfPresentEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
@@ -85,6 +84,11 @@ public:
             Istream&
         );
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const includeIfPresentEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
index 93bf0b5e39..975535ca41 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
@@ -85,12 +85,6 @@ class inputModeEntry
         //- Read the mode as a word and set enum appropriately
         static void setMode(Istream&);
 
-        //- Disallow default bitwise copy construct
-        inputModeEntry(const inputModeEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const inputModeEntry&) = delete;
-
 
 public:
 
@@ -98,6 +92,12 @@ public:
     ClassName("inputMode");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        inputModeEntry(const inputModeEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
@@ -117,6 +117,12 @@ public:
 
         //- Return true if the inputMode is %error
         static bool error();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const inputModeEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/negEntry/negEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/negEntry/negEntry.H
index 941ee2fc06..d63e6bb15c 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/negEntry/negEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/negEntry/negEntry.H
@@ -75,12 +75,6 @@ class negEntry
             Istream& is
         );
 
-        //- Disallow default bitwise copy construct
-        negEntry(const negEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const negEntry&) = delete;
-
 
 public:
 
@@ -88,6 +82,12 @@ public:
     ClassName("neg");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        negEntry(const negEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
@@ -100,6 +100,12 @@ public:
             primitiveEntry&,
             Istream&
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const negEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
index b5e6b58126..71de77e92d 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
@@ -64,14 +64,6 @@ class removeEntry
 :
     public functionEntry
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        removeEntry(const removeEntry&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const removeEntry&) = delete;
-
 
 public:
 
@@ -79,10 +71,22 @@ public:
     ClassName("remove");
 
 
+    // Constructors
+
+        //- Disallow default bitwise copy construct
+        removeEntry(const removeEntry&) = delete;
+
+
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
         static bool execute(dictionary& parentDict, Istream&);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const removeEntry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
index b93e4c3bd0..03d2719ce9 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
@@ -82,12 +82,6 @@ class codedBase
         //- Create library based on the dynamicCodeContext
         void createLibrary(dynamicCode&, const dynamicCodeContext&) const;
 
-        //- Disallow default bitwise copy construct
-        codedBase(const codedBase&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const codedBase&) = delete;
-
 
 protected:
 
@@ -124,9 +118,18 @@ public:
         //- Construct null
         codedBase();
 
+        //- Disallow default bitwise copy construct
+        codedBase(const codedBase&) = delete;
+
 
     //- Destructor
     virtual ~codedBase();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const codedBase&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
index 44ec99d8e4..54ebadb802 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
@@ -56,13 +56,6 @@ class dlLibraryTable
         DynamicList<fileName> libNames_;
 
 
-        //- Disallow default bitwise copy construct
-        dlLibraryTable(const dlLibraryTable&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const dlLibraryTable&) = delete;
-
-
 public:
 
     // Declare name of the class and its debug switch
@@ -77,6 +70,9 @@ public:
         //  the libraries to load
         dlLibraryTable(const dictionary&, const word&);
 
+        //- Disallow default bitwise copy construct
+        dlLibraryTable(const dlLibraryTable&) = delete;
+
 
     //- Destructor
     ~dlLibraryTable();
@@ -107,6 +103,12 @@ public:
             const word& libsEntry,
             const TablePtr& tablePtr
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const dlLibraryTable&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
index 2799cda868..b1a15dc240 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
@@ -90,15 +90,6 @@ private:
         std::string makeOptions_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        dynamicCode(const dynamicCode&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicCode&) = delete;
-
-
 protected:
 
     // Static data members
@@ -181,6 +172,9 @@ public:
             const word& codeDirName = ""
         );
 
+        //- Disallow default bitwise copy construct
+        dynamicCode(const dynamicCode&) = delete;
+
 
     // Member functions
 
@@ -278,6 +272,11 @@ public:
         //- Compile a libso
         bool wmakeLibso() const;
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const dynamicCode&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index 82822a5a63..1c9714f39e 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
@@ -62,12 +62,6 @@ class IOOutputFilter
     public IOdictionary,
     public OutputFilter
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        IOOutputFilter(const IOOutputFilter&) = delete;
-        void operator=(const IOOutputFilter&);
-
 
 public:
 
@@ -106,6 +100,9 @@ public:
             const bool loadFromFile = false
         );
 
+        //- Disallow default bitwise copy construct
+        IOOutputFilter(const IOOutputFilter&) = delete;
+
 
     //- Destructor
     virtual ~IOOutputFilter();
@@ -133,6 +130,12 @@ public:
 
         //- Update for changes of mesh
         virtual void movePoints(const polyMesh& mesh);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const IOOutputFilter&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index e59e3e2ec7..b06edb3aa7 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -145,15 +145,6 @@ class functionObject
         const word name_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        functionObject(const functionObject&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const functionObject&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -192,6 +183,9 @@ public:
             return autoPtr<functionObject>(nullptr);
         }
 
+        //- Disallow default bitwise copy construct
+        functionObject(const functionObject&) = delete;
+
 
     // Selectors
 
@@ -245,6 +239,12 @@ public:
 
         //- Update for changes of mesh
         virtual void movePoints(const polyMesh& mesh);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const functionObject&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 13a3020656..32ce90e7a3 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -95,12 +95,6 @@ class functionObjectList
         //  configuration files, add to the given map and recurse
         static void listDir(const fileName& dir, HashSet<word>& foMap);
 
-        //- Disallow default bitwise copy construct
-        functionObjectList(const functionObjectList&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const functionObjectList&) = delete;
-
 
 public:
 
@@ -136,6 +130,9 @@ public:
             const bool execution=true
         );
 
+        //- Disallow default bitwise copy construct
+        functionObjectList(const functionObjectList&) = delete;
+
         //- Construct and return a functionObjectList for an application.
         //  If the "dict" argument is specified the functionObjectList is
         //  constructed from that dictionary which is returned as
@@ -288,6 +285,12 @@ public:
 
         //- Update for changes of mesh
         void movePoints(const polyMesh& mesh);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const functionObjectList&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H b/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H
index 317826c095..5ff7bc2ad1 100644
--- a/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H
+++ b/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H
@@ -86,17 +86,6 @@ protected:
         virtual void writeFileHeader(const label i = 0) = 0;
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        logFiles(const logFiles&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const logFiles&) = delete;
-
-
 public:
 
     // Constructors
@@ -108,6 +97,9 @@ public:
             const word& prefix
         );
 
+        //- Disallow default bitwise copy construct
+        logFiles(const logFiles&) = delete;
+
 
     //- Destructor
     virtual ~logFiles();
@@ -129,6 +121,12 @@ public:
 
         //- Write function
         virtual bool write();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const logFiles&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
index 0817ba00ef..b2e781023c 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
@@ -102,17 +102,6 @@ protected:
         bool clearObject(const word& fieldName);
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        regionFunctionObject(const regionFunctionObject&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const regionFunctionObject&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -139,6 +128,9 @@ public:
             const dictionary& dict
         );
 
+        //- Disallow default bitwise copy construct
+        regionFunctionObject(const regionFunctionObject&) = delete;
+
 
     //- Destructor
     virtual ~regionFunctionObject();
@@ -148,6 +140,12 @@ public:
 
         //- Read optional controls
         virtual bool read(const dictionary&);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionFunctionObject&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
index 8318785509..1214df9f0f 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
@@ -92,15 +92,6 @@ private:
         label executionIndex_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        timeControl(const timeControl&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const timeControl&) = delete;
-
-
 public:
 
     // Constructors
@@ -113,6 +104,9 @@ public:
             const word& prefix
         );
 
+        //- Disallow default bitwise copy construct and assignment
+        timeControl(const timeControl&) = delete;
+
 
     //- Destructor
     ~timeControl();
@@ -137,6 +131,12 @@ public:
 
         //- Return the index of the previous execution
         inline label executionIndex() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const timeControl&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
index fa0736e257..a41e3b3f5b 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
@@ -99,12 +99,6 @@ class timeControl
         //- Returns true if within time bounds
         bool active() const;
 
-        //- Disallow default bitwise copy construct
-        timeControl(const timeControl&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const timeControl&) = delete;
-
 
 public:
 
@@ -122,6 +116,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construct
+        timeControl(const timeControl&) = delete;
+
 
     // Member Functions
 
@@ -169,6 +166,12 @@ public:
 
             //- Update for changes of mesh
             virtual void movePoints(const polyMesh& mesh);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const timeControl&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
index 2ca63e9fbe..8e94504c0b 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
@@ -67,17 +67,6 @@ protected:
         const word prefix_;
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        writeFile(const writeFile&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const writeFile&) = delete;
-
-
 public:
 
     //- Directory prefix
@@ -96,6 +85,9 @@ public:
             const word& prefix
         );
 
+        //- Disallow default bitwise copy construct
+        writeFile(const writeFile&) = delete;
+
 
     //- Destructor
     ~writeFile();
@@ -138,6 +130,12 @@ public:
 
         //- Return width of character stream output
         label charWidth() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const writeFile&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/writeLocalObjects/writeLocalObjects.H b/src/OpenFOAM/db/functionObjects/writeLocalObjects/writeLocalObjects.H
index 80284bccca..cd60d6074d 100644
--- a/src/OpenFOAM/db/functionObjects/writeLocalObjects/writeLocalObjects.H
+++ b/src/OpenFOAM/db/functionObjects/writeLocalObjects/writeLocalObjects.H
@@ -110,17 +110,6 @@ protected:
         virtual wordList objectNames();
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        writeLocalObjects(const writeLocalObjects&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const writeLocalObjects&) = delete;
-
-
 public:
 
     // Constructors
@@ -132,6 +121,9 @@ public:
             const Switch& logRef
         );
 
+        //- Disallow default bitwise copy construct
+        writeLocalObjects(const writeLocalObjects&) = delete;
+
 
     //- Destructor
     virtual ~writeLocalObjects();
@@ -144,6 +136,12 @@ public:
 
         //- Read the list of objects to be written
         virtual bool read(const dictionary&);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const writeLocalObjects&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/writeObjectsBase/writeObjectsBase.H b/src/OpenFOAM/db/functionObjects/writeObjectsBase/writeObjectsBase.H
index 78baa9c4c0..ffcb570d35 100644
--- a/src/OpenFOAM/db/functionObjects/writeObjectsBase/writeObjectsBase.H
+++ b/src/OpenFOAM/db/functionObjects/writeObjectsBase/writeObjectsBase.H
@@ -117,17 +117,6 @@ protected:
         virtual void writeObject(const regIOobject& obj);
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        writeObjectsBase(const writeObjectsBase&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const writeObjectsBase&) = delete;
-
-
 public:
 
     // Constructors
@@ -139,6 +128,9 @@ public:
             const Switch& logRef
         );
 
+        //- Disallow default bitwise copy construct
+        writeObjectsBase(const writeObjectsBase&) = delete;
+
 
     //- Destructor
     virtual ~writeObjectsBase();
@@ -154,6 +146,12 @@ public:
 
         //- Write function
         virtual bool write();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const writeObjectsBase&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 8736afbc34..88e8e8e6c6 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -74,12 +74,6 @@ class objectRegistry
         //  Used to terminate searching within the ancestors
         bool parentNotTime() const;
 
-        //- Disallow Copy constructor
-        objectRegistry(const objectRegistry&);
-
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const objectRegistry&) = delete;
-
 
 public:
 
@@ -105,6 +99,9 @@ public:
             const label nIoObjects = 128
         );
 
+        //- Disallow Copy constructor
+        objectRegistry(const objectRegistry&);
+
 
     //- Destructor
     virtual ~objectRegistry();
@@ -234,6 +231,12 @@ public:
                 IOstream::compressionType cmp,
                 const bool write
             ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise copy construct and assignment
+        void operator=(const objectRegistry&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index 1dc2bc5f0b..d7b7fd436d 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -96,20 +96,6 @@ private:
             const bool preserveCouples
         );
 
-        ////- Disallow default bitwise copy construct
-        // SlicedGeometricField(const SlicedGeometricField&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const SlicedGeometricField&) = delete;
-
-        //- Disallow standard assignment to GeometricField,
-        //  == assignment is allowed.
-        void operator=(const GeometricField<Type, PatchField, GeoMesh>&);
-
-        //- Disallow standard assignment to tmp<GeometricField>,
-        //  == assignment is allowed.
-        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
-
 
 public:
 
@@ -172,6 +158,26 @@ public:
 
         //- Correct boundary field
         void correctBoundaryConditions();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SlicedGeometricField&) = delete;
+
+        //- Disallow standard assignment to GeometricField,
+        //  == assignment is allowed.
+        void operator=
+        (
+            const GeometricField<Type, PatchField, GeoMesh>&
+        ) = delete;
+
+        //- Disallow standard assignment to tmp<GeometricField>,
+        //  == assignment is allowed.
+        void operator=
+        (
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
+        ) = delete;
 };
 
 
diff --git a/src/OpenFOAM/fields/cloud/cloud.H b/src/OpenFOAM/fields/cloud/cloud.H
index deed825dcd..b57f6ee9d9 100644
--- a/src/OpenFOAM/fields/cloud/cloud.H
+++ b/src/OpenFOAM/fields/cloud/cloud.H
@@ -54,15 +54,6 @@ class cloud
     public objectRegistry
 {
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        cloud(const cloud&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const cloud&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -80,6 +71,9 @@ public:
         //- Construct for the given objectRegistry and named cloud instance
         cloud(const objectRegistry&, const word& cloudName = defaultName);
 
+        //- Disallow default bitwise copy construct
+        cloud(const cloud&) = delete;
+
 
     //- Destructor
     virtual ~cloud();
@@ -92,6 +86,12 @@ public:
             //- Remap the cells of particles corresponding to the
             //  mesh topology change
             virtual void autoMap(const mapPolyMesh&);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const cloud&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H
index e908ab76de..67d41d03d3 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H
@@ -53,18 +53,6 @@ class pointPatchFieldMapperPatchRef
         const pointPatch& targetPatch_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        pointPatchFieldMapperPatchRef
-        (
-            const pointPatchFieldMapperPatchRef&
-        ) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointPatchFieldMapperPatchRef&) = delete;
-
-
 public:
 
     // Constructors
@@ -80,6 +68,12 @@ public:
             targetPatch_(target)
         {}
 
+        //- Disallow default bitwise copy construct
+        pointPatchFieldMapperPatchRef
+        (
+            const pointPatchFieldMapperPatchRef&
+        ) = delete;
+
 
     // Member functions
 
@@ -92,6 +86,12 @@ public:
         {
             return targetPatch_;
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointPatchFieldMapperPatchRef&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
index da7e7b3dae..17fdf24863 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
@@ -56,16 +56,6 @@ class objectRegistry;
 class interpolationWeights
 {
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        interpolationWeights(const interpolationWeights&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const interpolationWeights&) = delete;
-
 protected:
 
         const scalarField& samples_;
@@ -95,6 +85,9 @@ public:
         //- Construct from components
         interpolationWeights(const scalarField& samples);
 
+        //- Disallow default bitwise copy construct
+        interpolationWeights(const interpolationWeights&) = delete;
+
 
     // Selectors
 
@@ -140,6 +133,11 @@ public:
         >::type
         weightedSum(const ListType1& f1, const ListType2& f2);
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const interpolationWeights&) = delete;
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index 95722f74a5..78092f9e47 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
@@ -114,12 +114,6 @@ class PatchToPatchInterpolation
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PatchToPatchInterpolation(const PatchToPatchInterpolation&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PatchToPatchInterpolation&) = delete;
-
         //- Calculate point weights
         void calcPointAddressing() const;
 
@@ -163,6 +157,9 @@ public:
             const intersection::direction dir = intersection::direction::vector
         );
 
+        //- Disallow default bitwise copy construct
+        PatchToPatchInterpolation(const PatchToPatchInterpolation&) = delete;
+
 
     //- Destructor
     ~PatchToPatchInterpolation();
@@ -221,6 +218,11 @@ public:
         template<class Type>
         tmp<Field<Type>> faceInterpolate(const tmp<Field<Type>>& tpf) const;
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PatchToPatchInterpolation&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index dd06b7e984..b653bd8286 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -68,16 +68,6 @@ class PrimitivePatchInterpolation
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PrimitivePatchInterpolation
-        (
-            const PrimitivePatchInterpolation&
-        ) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PrimitivePatchInterpolation&) = delete;
-
-
         //- Face-to-point weights
         const scalarListList& faceToPointWeights() const;
 
@@ -101,6 +91,12 @@ public:
         //- Construct from PrimitivePatch
         PrimitivePatchInterpolation(const Patch& p);
 
+        //- Disallow default bitwise copy construct
+        PrimitivePatchInterpolation
+        (
+            const PrimitivePatchInterpolation&
+        ) = delete;
+
 
     //- Destructor
     ~PrimitivePatchInterpolation();
@@ -149,6 +145,12 @@ public:
 
         //- Do what is necessary if the mesh has moved
         bool movePoints();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PrimitivePatchInterpolation&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
index 52c7952906..7b59d1814a 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
@@ -95,9 +95,6 @@ class uniformInterpolationTable
         //- Check that the table is valid
         void checkTable() const;
 
-        //- Disallow default bitwise assignment
-        void operator=(const uniformInterpolationTable&) = delete;
-
 
 public:
 
@@ -186,6 +183,12 @@ public:
 
             //- Write
             void write() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const uniformInterpolationTable&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
index 2a80e4e9f3..a1d773d704 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
@@ -58,14 +58,6 @@ class LduInterfaceField
 :
     public lduInterfaceField
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        LduInterfaceField(const LduInterfaceField&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const LduInterfaceField&) = delete;
-
 
 public:
 
@@ -81,6 +73,9 @@ public:
             lduInterfaceField(patch)
         {}
 
+        //- Disallow default bitwise copy construct
+        LduInterfaceField(const LduInterfaceField&) = delete;
+
 
     //- Destructor
     virtual ~LduInterfaceField();
@@ -114,6 +109,12 @@ public:
                 const scalarField&,
                 const Pstream::commsTypes commsType
             ) const = 0;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const LduInterfaceField&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
index 922af63b04..779e6e5c83 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
@@ -60,15 +60,6 @@ class DiagonalPreconditioner
         Field<DType> rD;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        DiagonalPreconditioner(const DiagonalPreconditioner&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const DiagonalPreconditioner&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -84,6 +75,9 @@ public:
             const dictionary& preconditionerDict
         );
 
+        //- Disallow default bitwise copy construct
+        DiagonalPreconditioner(const DiagonalPreconditioner&) = delete;
+
 
     // Destructor
 
@@ -114,6 +108,12 @@ public:
         {
             return(precondition(wT, rT));
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const DiagonalPreconditioner&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
index 7cfe9e13e5..7c62648690 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
@@ -51,14 +51,6 @@ class NoPreconditioner
 :
     public LduMatrix<Type, DType, LUType>::preconditioner
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        NoPreconditioner(const NoPreconditioner&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const NoPreconditioner&) = delete;
-
 
 public:
 
@@ -75,6 +67,9 @@ public:
             const dictionary& preconditionerDict
         );
 
+        //- Disallow default bitwise copy construct
+        NoPreconditioner(const NoPreconditioner&) = delete;
+
 
     // Destructor
 
@@ -105,6 +100,12 @@ public:
         {
             return(precondition(wT, rT));
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const NoPreconditioner&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
index 0243907f80..6ae8507867 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
@@ -51,14 +51,6 @@ class DiagonalSolver
 :
     public LduMatrix<Type, DType, LUType>::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        DiagonalSolver(const DiagonalSolver&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const DiagonalSolver&) = delete;
-
 
 public:
 
@@ -76,6 +68,9 @@ public:
             const dictionary& solverDict
         );
 
+        //- Disallow default bitwise copy construct
+        DiagonalSolver(const DiagonalSolver&) = delete;
+
 
     // Member Functions
 
@@ -84,6 +79,12 @@ public:
 
         //- Solve the matrix with this solver
         virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const DiagonalSolver&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
index acc999479e..d6e7445c04 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
@@ -52,14 +52,6 @@ class PBiCCCG
 :
     public LduMatrix<Type, DType, LUType>::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        PBiCCCG(const PBiCCCG&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCCCG&) = delete;
-
 
 public:
 
@@ -77,6 +69,9 @@ public:
             const dictionary& solverDict
         );
 
+        //- Disallow default bitwise copy construct
+        PBiCCCG(const PBiCCCG&) = delete;
+
 
     // Destructor
 
@@ -88,6 +83,12 @@ public:
 
         //- Solve the matrix with this solver
         virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PBiCCCG&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
index 758819b2c9..5ae22ea89b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
@@ -52,14 +52,6 @@ class PBiCICG
 :
     public LduMatrix<Type, DType, LUType>::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        PBiCICG(const PBiCICG&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCICG&) = delete;
-
 
 public:
 
@@ -77,6 +69,9 @@ public:
             const dictionary& solverDict
         );
 
+        //- Disallow default bitwise copy construct
+        PBiCICG(const PBiCICG&) = delete;
+
 
     // Destructor
 
@@ -88,6 +83,12 @@ public:
 
         //- Solve the matrix with this solver
         virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PBiCICG&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
index 5398349f1e..7c6d2ee2f0 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
@@ -52,14 +52,6 @@ class PCICG
 :
     public LduMatrix<Type, DType, LUType>::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        PCICG(const PCICG&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PCICG&) = delete;
-
 
 public:
 
@@ -77,6 +69,9 @@ public:
             const dictionary& solverDict
         );
 
+        //- Disallow default bitwise copy construct
+        PCICG(const PCICG&) = delete;
+
 
     // Destructor
 
@@ -88,6 +83,12 @@ public:
 
         //- Solve the matrix with this solver
         virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PCICG&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
index 26ea3f8222..9c5b289e44 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
@@ -131,12 +131,6 @@ class lduAddressing
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        lduAddressing(const lduAddressing&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const lduAddressing&) = delete;
-
         //- Calculate losort
         void calcLosort() const;
 
@@ -149,14 +143,18 @@ class lduAddressing
 
 public:
 
-    // Constructor
-    lduAddressing(const label nEqns)
-    :
-        size_(nEqns),
-        losortPtr_(nullptr),
-        ownerStartPtr_(nullptr),
-        losortStartPtr_(nullptr)
-    {}
+    // Constructors
+
+        lduAddressing(const label nEqns)
+        :
+            size_(nEqns),
+            losortPtr_(nullptr),
+            ownerStartPtr_(nullptr),
+            losortStartPtr_(nullptr)
+        {}
+
+        //- Disallow default bitwise copy construct
+        lduAddressing(const lduAddressing&) = delete;
 
 
     //- Destructor
@@ -200,6 +198,12 @@ public:
 
         //- Calculate bandwidth and profile of addressing
         Tuple2<label, scalar> band() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const lduAddressing&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 45c638fa33..821cc42b5a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -53,14 +53,6 @@ namespace Foam
 
 class lduInterface
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        lduInterface(const lduInterface&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const lduInterface&) = delete;
-
 
 public:
 
@@ -74,6 +66,9 @@ public:
         lduInterface()
         {}
 
+        //- Disallow default bitwise copy construct
+        lduInterface(const lduInterface&) = delete;
+
 
     //- Destructor
     virtual ~lduInterface();
@@ -110,6 +105,12 @@ public:
                 const Pstream::commsTypes commsType,
                 const labelUList& iF
             ) const = 0;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const lduInterface&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index 4263563917..f461d7eff3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -65,15 +65,6 @@ class lduInterfaceField
         bool updatedMatrix_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        lduInterfaceField(const lduInterfaceField&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const lduInterfaceField&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -89,6 +80,9 @@ public:
             updatedMatrix_(false)
         {}
 
+        //- Disallow default bitwise copy construct
+        lduInterfaceField(const lduInterfaceField&) = delete;
+
 
     //- Destructor
     virtual ~lduInterfaceField();
@@ -151,6 +145,12 @@ public:
                 const direction,
                 const Pstream::commsTypes commsType
             ) const = 0;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const lduInterfaceField&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
index 57ed241656..603646bfb7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
@@ -62,15 +62,6 @@ class FDICPreconditioner
         scalarField rDlUpper_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        FDICPreconditioner(const FDICPreconditioner&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const FDICPreconditioner&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -86,6 +77,9 @@ public:
             const dictionary& solverControlsUnused
         );
 
+        //- Disallow default bitwise copy construct
+        FDICPreconditioner(const FDICPreconditioner&) = delete;
+
 
     //- Destructor
     virtual ~FDICPreconditioner()
@@ -101,6 +95,12 @@ public:
             const scalarField& rA,
             const direction cmpt=0
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const FDICPreconditioner&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
index cc5f883f5f..13a4173ae0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
@@ -59,15 +59,6 @@ class diagonalPreconditioner
         scalarField rD;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        diagonalPreconditioner(const diagonalPreconditioner&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const diagonalPreconditioner&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -83,6 +74,9 @@ public:
             const dictionary& solverControlsUnused
         );
 
+        //- Disallow default bitwise copy construct
+        diagonalPreconditioner(const diagonalPreconditioner&) = delete;
+
 
     //- Destructor
     virtual ~diagonalPreconditioner()
@@ -109,6 +103,12 @@ public:
         {
             return precondition(wT, rT, cmpt);
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const diagonalPreconditioner&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
index 0c3fd0b0ee..84230dd0d6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
@@ -50,14 +50,6 @@ class noPreconditioner
 :
     public lduMatrix::preconditioner
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        noPreconditioner(const noPreconditioner&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const noPreconditioner&) = delete;
-
 
 public:
 
@@ -74,6 +66,9 @@ public:
             const dictionary& solverControlsUnused
         );
 
+        //- Disallow default bitwise copy construct
+        noPreconditioner(const noPreconditioner&) = delete;
+
 
     //- Destructor
     virtual ~noPreconditioner()
@@ -100,6 +95,12 @@ public:
         {
             return precondition(wT, rT, cmpt);
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const noPreconditioner&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index 6fb3050618..9d6b3bbb94 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -203,17 +203,6 @@ protected:
             );
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        GAMGAgglomeration(const GAMGAgglomeration&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGAgglomeration&) = delete;
-
-
 public:
 
     //- Declare friendship with GAMGProcAgglomeration
@@ -289,6 +278,9 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        GAMGAgglomeration(const GAMGAgglomeration&) = delete;
+
 
     // Selectors
 
@@ -491,6 +483,12 @@ public:
             const labelUList& restrict,
             const label nCoarse
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const GAMGAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
index accc6d8602..07c0cfa66c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
@@ -56,15 +56,6 @@ class dummyAgglomeration
         label nLevels_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        dummyAgglomeration(const dummyAgglomeration&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const dummyAgglomeration&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -79,6 +70,16 @@ public:
             const lduMesh& mesh,
             const dictionary& controlDict
         );
+
+        //- Disallow default bitwise copy construct
+        dummyAgglomeration(const dummyAgglomeration&) = delete;
+
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const dummyAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
index 4fb38d5313..7c9f9efa11 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
@@ -71,12 +71,6 @@ protected:
             const scalarField& faceWeights
         );
 
-        //- Disallow default bitwise copy construct
-        pairGAMGAgglomeration(const pairGAMGAgglomeration&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pairGAMGAgglomeration&) = delete;
-
 
 public:
 
@@ -93,6 +87,9 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        pairGAMGAgglomeration(const pairGAMGAgglomeration&) = delete;
+
         //- Calculate and return agglomeration
         static tmp<labelField> agglomerate
         (
@@ -100,6 +97,12 @@ public:
             const lduAddressing& fineMatrixAddressing,
             const scalarField& faceWeights
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pairGAMGAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
index 2875935c00..bccb50057d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
@@ -78,18 +78,6 @@ protected:
         //- Debug: calculate global cell-cells
         static labelListList globalCellCells(const lduMesh&);
 
-private:
-
-    // Private data
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        GAMGProcAgglomeration(const GAMGProcAgglomeration&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGProcAgglomeration&) = delete;
-
 
 public:
 
@@ -125,6 +113,9 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        GAMGProcAgglomeration(const GAMGProcAgglomeration&) = delete;
+
 
     // Selectors
 
@@ -146,6 +137,11 @@ public:
         //- Modify agglomeration. Return true if modified
         virtual bool agglomerate() = 0;
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const GAMGProcAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
index 94b00da7a0..fde580fe89 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
@@ -62,17 +62,6 @@ class eagerGAMGProcAgglomeration
 
         DynamicList<label> comms_;
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        eagerGAMGProcAgglomeration
-        (
-            const eagerGAMGProcAgglomeration&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const eagerGAMGProcAgglomeration&) = delete;
-
 
 public:
 
@@ -89,6 +78,12 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        eagerGAMGProcAgglomeration
+        (
+            const eagerGAMGProcAgglomeration&
+        );
+
 
     //- Destructor
     virtual ~eagerGAMGProcAgglomeration();
@@ -99,6 +94,11 @@ public:
        //- Modify agglomeration. Return true if modified
         virtual bool agglomerate();
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const eagerGAMGProcAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
index be8e9d9f29..b792ede023 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
@@ -87,18 +87,6 @@ class manualGAMGProcAgglomeration
         DynamicList<label> comms_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        manualGAMGProcAgglomeration
-        (
-            const manualGAMGProcAgglomeration&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const manualGAMGProcAgglomeration&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -114,6 +102,12 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        manualGAMGProcAgglomeration
+        (
+            const manualGAMGProcAgglomeration&
+        );
+
 
     //- Destructor
     virtual ~manualGAMGProcAgglomeration();
@@ -124,6 +118,11 @@ public:
        //- Modify agglomeration. Return true if modified
         virtual bool agglomerate();
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const manualGAMGProcAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
index b6c7b34173..202a43bf33 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
@@ -57,17 +57,6 @@ class masterCoarsestGAMGProcAgglomeration
 
         DynamicList<label> comms_;
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        masterCoarsestGAMGProcAgglomeration
-        (
-            const masterCoarsestGAMGProcAgglomeration&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const masterCoarsestGAMGProcAgglomeration&) = delete;
-
 
 public:
 
@@ -84,6 +73,12 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        masterCoarsestGAMGProcAgglomeration
+        (
+            const masterCoarsestGAMGProcAgglomeration&
+        );
+
 
     //- Destructor
     virtual ~masterCoarsestGAMGProcAgglomeration();
@@ -94,6 +89,12 @@ public:
        //- Modify agglomeration. Return true if modified
         virtual bool agglomerate();
 
+        //- Disallow default bitwise assignment
+
+
+    // Member Operators
+
+        void operator=(const masterCoarsestGAMGProcAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H
index 871b7d466a..edf104f620 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H
@@ -53,17 +53,6 @@ class noneGAMGProcAgglomeration
 :
     public GAMGProcAgglomeration
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        noneGAMGProcAgglomeration
-        (
-            const noneGAMGProcAgglomeration&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const noneGAMGProcAgglomeration&) = delete;
-
 
 public:
 
@@ -80,6 +69,12 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        noneGAMGProcAgglomeration
+        (
+            const noneGAMGProcAgglomeration&
+        );
+
 
     //- Destructor
     virtual ~noneGAMGProcAgglomeration();
@@ -93,6 +88,11 @@ public:
             return false;
         }
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const noneGAMGProcAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
index 515e24e652..e236a31261 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
@@ -87,15 +87,6 @@ class procFacesGAMGProcAgglomeration
         //- Do we need to agglomerate across processors?
         bool doProcessorAgglomeration(const lduMesh&) const;
 
-        //- Disallow default bitwise copy construct
-        procFacesGAMGProcAgglomeration
-        (
-            const procFacesGAMGProcAgglomeration&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const procFacesGAMGProcAgglomeration&) = delete;
-
 
 public:
 
@@ -112,6 +103,12 @@ public:
             const dictionary& controlDict
         );
 
+        //- Disallow default bitwise copy construct
+        procFacesGAMGProcAgglomeration
+        (
+            const procFacesGAMGProcAgglomeration&
+        );
+
 
     //- Destructor
     virtual ~procFacesGAMGProcAgglomeration();
@@ -122,6 +119,11 @@ public:
        //- Modify agglomeration. Return true if modified
         virtual bool agglomerate();
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const procFacesGAMGProcAgglomeration&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H
index d3e48d3802..918133a096 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H
@@ -59,15 +59,6 @@ class GAMGInterfaceField
         const GAMGInterface& interface_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        GAMGInterfaceField(const GAMGInterfaceField&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGInterfaceField&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -147,6 +138,9 @@ public:
             interface_(GAMGCp)
         {}
 
+        //- Disallow default bitwise copy construct
+        GAMGInterfaceField(const GAMGInterfaceField&) = delete;
+
 
     // Member Functions
 
@@ -158,6 +152,11 @@ public:
                 return interface_;
             }
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const GAMGInterfaceField&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
index ab29a2b840..48a8ce89d4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
@@ -65,15 +65,6 @@ class cyclicGAMGInterfaceField
         int rank_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        cyclicGAMGInterfaceField(const cyclicGAMGInterfaceField&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicGAMGInterfaceField&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -97,6 +88,9 @@ public:
             const int rank
         );
 
+        //- Disallow default bitwise copy construct
+        cyclicGAMGInterfaceField(const cyclicGAMGInterfaceField&) = delete;
+
 
     //- Destructor
     virtual ~cyclicGAMGInterfaceField();
@@ -151,6 +145,12 @@ public:
                 const direction cmpt,
                 const Pstream::commsTypes commsType
             ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const cyclicGAMGInterfaceField&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index e415b36cb3..782261ebb6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -80,19 +80,6 @@ class processorGAMGInterfaceField
             mutable Field<scalar> scalarReceiveBuf_;
 
 
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        processorGAMGInterfaceField
-        (
-            const processorGAMGInterfaceField&
-        ) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const processorGAMGInterfaceField&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -116,6 +103,12 @@ public:
             const int rank
         );
 
+        //- Disallow default bitwise copy construct
+        processorGAMGInterfaceField
+        (
+            const processorGAMGInterfaceField&
+        ) = delete;
+
 
     //- Destructor
     virtual ~processorGAMGInterfaceField();
@@ -192,6 +185,12 @@ public:
             {
                 return rank_;
             }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const processorGAMGInterfaceField&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index 09fdadb727..f6d5f0fd41 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -71,17 +71,6 @@ protected:
         labelList faceRestrictAddressing_;
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        GAMGInterface(const GAMGInterface&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGInterface&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -197,6 +186,9 @@ public:
             Istream& is
         );
 
+        //- Disallow default bitwise copy construct
+        GAMGInterface(const GAMGInterface&) = delete;
+
 
     // Member Functions
 
@@ -277,6 +269,12 @@ public:
 
             //- Write to stream
             virtual void write(Ostream&) const = 0;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const GAMGInterface&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index 55f3e55523..35c4b9c41d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -67,15 +67,6 @@ class cyclicGAMGInterface
         tensorField reverseT_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        cyclicGAMGInterface(const cyclicGAMGInterface&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicGAMGInterface&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -105,6 +96,9 @@ public:
             Istream& is
         );
 
+        //- Disallow default bitwise copy construct
+        cyclicGAMGInterface(const cyclicGAMGInterface&) = delete;
+
 
     //- Destructor
     virtual ~cyclicGAMGInterface();
@@ -160,6 +154,12 @@ public:
 
             //- Write to stream
             virtual void write(Ostream&) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const cyclicGAMGInterface&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
index 0a4fd31d13..c60f41d666 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
@@ -51,17 +51,6 @@ class processorCyclicGAMGInterface
 :
     public processorGAMGInterface
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        processorCyclicGAMGInterface
-        (
-            const processorCyclicGAMGInterface&
-        ) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const processorCyclicGAMGInterface&) = delete;
-
 
 public:
 
@@ -91,11 +80,22 @@ public:
             Istream& is
         );
 
+        //- Disallow default bitwise copy construct
+        processorCyclicGAMGInterface
+        (
+            const processorCyclicGAMGInterface&
+        ) = delete;
+
 
     // Destructor
 
         virtual ~processorCyclicGAMGInterface();
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const processorCyclicGAMGInterface&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index 665240c87c..229f9b5a83 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -70,15 +70,6 @@ class processorGAMGInterface
         int tag_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        processorGAMGInterface(const processorGAMGInterface&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const processorGAMGInterface&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -121,6 +112,9 @@ public:
             Istream& is
         );
 
+        //- Disallow default bitwise copy construct
+        processorGAMGInterface(const processorGAMGInterface&) = delete;
+
 
     //- Destructor
     virtual ~processorGAMGInterface();
@@ -182,6 +176,12 @@ public:
 
             //- Write to stream
             virtual void write(Ostream&) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const processorGAMGInterface&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
index ef5ef7e4f0..1ed8cd3263 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
@@ -51,14 +51,6 @@ class PBiCG
 :
     public lduMatrix::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        PBiCG(const PBiCG&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCG&) = delete;
-
 
 public:
 
@@ -79,6 +71,9 @@ public:
             const dictionary& solverControls
         );
 
+        //- Disallow default bitwise copy construct
+        PBiCG(const PBiCG&) = delete;
+
 
     //- Destructor
     virtual ~PBiCG()
@@ -94,6 +89,12 @@ public:
             const scalarField& source,
             const direction cmpt=0
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PBiCG&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
index 4873a6de58..3f88e44672 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
@@ -66,14 +66,6 @@ class PBiCGStab
 :
     public lduMatrix::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        PBiCGStab(const PBiCGStab&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCGStab&) = delete;
-
 
 public:
 
@@ -94,6 +86,9 @@ public:
             const dictionary& solverControls
         );
 
+        //- Disallow default bitwise copy construct
+        PBiCGStab(const PBiCGStab&) = delete;
+
 
     //- Destructor
     virtual ~PBiCGStab()
@@ -109,6 +104,12 @@ public:
             const scalarField& source,
             const direction cmpt=0
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PBiCGStab&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
index 5b6b3b1e4c..cee554245a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
@@ -51,14 +51,6 @@ class PCG
 :
     public lduMatrix::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        PCG(const PCG&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const PCG&) = delete;
-
 
 public:
 
@@ -79,6 +71,9 @@ public:
             const dictionary& solverControls
         );
 
+        //- Disallow default bitwise copy construct
+        PCG(const PCG&) = delete;
+
 
     //- Destructor
     virtual ~PCG()
@@ -94,6 +89,12 @@ public:
             const scalarField& source,
             const direction cmpt=0
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PCG&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
index 58589f5722..ea229cf087 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
@@ -50,14 +50,6 @@ class diagonalSolver
 :
     public lduMatrix::solver
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        diagonalSolver(const diagonalSolver&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const diagonalSolver&) = delete;
-
 
 public:
 
@@ -78,6 +70,9 @@ public:
             const dictionary& solverControls
         );
 
+        //- Disallow default bitwise copy construct
+        diagonalSolver(const diagonalSolver&) = delete;
+
 
     // Member Functions
 
@@ -92,6 +87,12 @@ public:
             const scalarField& source,
             const direction cmpt=0
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const diagonalSolver&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
index f406ce2ca4..19d9f4e278 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
@@ -71,12 +71,6 @@ class SVD
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        SVD(const SVD&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const SVD&) = delete;
-
         template<class T>
         inline const T sign(const T& a, const T& b);
 
@@ -88,6 +82,9 @@ public:
         //- Construct from a rectangular Matrix
         SVD(const scalarRectangularMatrix& A, const scalar minCondition = 0);
 
+        //- Disallow default bitwise copy construct
+        SVD(const SVD&) = delete;
+
 
     // Access functions
 
@@ -111,6 +108,12 @@ public:
 
         //- Return the matrix product V S^(-1) U^T (the pseudo inverse)
         scalarRectangularMatrix VSinvUt() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SVD&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/solution/solution.H b/src/OpenFOAM/matrices/solution/solution.H
index 6efe36bdaa..c5e41a357b 100644
--- a/src/OpenFOAM/matrices/solution/solution.H
+++ b/src/OpenFOAM/matrices/solution/solution.H
@@ -79,10 +79,6 @@ class solution
         //- Read settings from the dictionary
         void read(const dictionary&);
 
-        //- Disallow default bitwise copy construct and assignment
-        solution(const solution&) = delete;
-        void operator=(const solution&);
-
 
 public:
 
@@ -104,6 +100,9 @@ public:
             const fileName& dictName
         );
 
+        //- Disallow default bitwise copy construct
+        solution(const solution&) = delete;
+
 
     // Member Functions
 
@@ -145,6 +144,11 @@ public:
 
             //- Read the solution dictionary
             bool read();
+
+
+    // Member Operators
+
+        void operator=(const solution&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/matrices/tolerances/tolerances.H b/src/OpenFOAM/matrices/tolerances/tolerances.H
index 6336cbc08a..55922d1d7e 100644
--- a/src/OpenFOAM/matrices/tolerances/tolerances.H
+++ b/src/OpenFOAM/matrices/tolerances/tolerances.H
@@ -57,13 +57,6 @@ class tolerances
         dictionary solverRelativeTolerances_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        tolerances(const tolerances&) = delete;
-        void operator=(const tolerances&);
-
-
 public:
 
     // Constructors
@@ -71,6 +64,9 @@ public:
         //- Construct from time
         tolerances(const Time& t, const fileName& dictName);
 
+        //- Disallow default bitwise copy construct
+        tolerances(const tolerances&) = delete;
+
 
     // Member Functions
 
@@ -89,6 +85,11 @@ public:
 
             //- Read the tolerances
             bool read();
+
+
+    // Member Operators
+
+        void operator=(const tolerances&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/Residuals/Residuals.H b/src/OpenFOAM/meshes/Residuals/Residuals.H
index f6207ec26b..be229047e6 100644
--- a/src/OpenFOAM/meshes/Residuals/Residuals.H
+++ b/src/OpenFOAM/meshes/Residuals/Residuals.H
@@ -61,15 +61,6 @@ class Residuals
         mutable label prevTimeIndex_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        Residuals(const Residuals<Type>&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const Residuals<Type>&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -81,6 +72,9 @@ public:
         //- Construct for given mesh
         Residuals(const polyMesh& mesh);
 
+        //- Disallow default bitwise copy construct
+        Residuals(const Residuals<Type>&) = delete;
+
 
     // Member Functions
 
@@ -105,6 +99,12 @@ public:
             const polyMesh& mesh,
             const SolverPerformance<Type>&
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Residuals<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index 196ebfd8cf..20703b95c3 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -73,6 +73,7 @@ class lduPrimitiveMesh
         //- Communicator to use for any parallel communication
         const label comm_;
 
+
     // Private Member Functions
 
         //- Get size of all meshes
@@ -93,12 +94,6 @@ class lduPrimitiveMesh
             const labelUList& u
         );
 
-        //- Disallow default bitwise copy construct
-        lduPrimitiveMesh(const lduPrimitiveMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const lduPrimitiveMesh&) = delete;
-
 
 public:
 
@@ -175,6 +170,9 @@ public:
             labelListListList& boundaryFaceMap
         );
 
+        //- Disallow default bitwise copy construct
+        lduPrimitiveMesh(const lduPrimitiveMesh&) = delete;
+
 
     //- Destructor
     virtual ~lduPrimitiveMesh()
@@ -261,6 +259,11 @@ public:
             template<class ProcPatch>
             static lduSchedule nonBlockingSchedule(const lduInterfacePtrsList&);
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const lduPrimitiveMesh&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
index 96efd34e33..4bd2cea3a7 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
@@ -173,15 +173,6 @@ protected:
         ) const;
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        cellMatcher(const cellMatcher&) = delete;
-        void operator=(const cellMatcher&);
-
-
 public:
 
     // Constructors
@@ -195,6 +186,9 @@ public:
             const word& cellModelName
         );
 
+        //- Disallow default bitwise copy construct and assignment
+        cellMatcher(const cellMatcher&) = delete;
+
 
     //- Destructor
     virtual ~cellMatcher()
@@ -269,6 +263,10 @@ public:
                 cellShape& shape
             ) = 0;
 
+
+    // Member Operators
+
+        void operator=(const cellMatcher&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
index 4550433943..e42d4c978b 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
@@ -61,15 +61,6 @@ class hexMatcher
         static const label maxVertPerFace;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        hexMatcher(const hexMatcher&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const hexMatcher&) = delete;
-
-
 public:
 
     // Constructors
@@ -77,6 +68,10 @@ public:
         //- Construct null
         hexMatcher();
 
+        //- Disallow default bitwise copy construct
+        hexMatcher(const hexMatcher&) = delete;
+
+
     //- Destructor
     ~hexMatcher();
 
@@ -121,6 +116,12 @@ public:
             const label celli,
             cellShape& shape
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const hexMatcher&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
index a69cb870d8..2553300e9c 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
@@ -61,15 +61,6 @@ class prismMatcher
         static const label maxVertPerFace;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        prismMatcher(const prismMatcher&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const prismMatcher&) = delete;
-
-
 public:
 
     // Constructors
@@ -77,6 +68,10 @@ public:
         //- Construct
         prismMatcher();
 
+        //- Disallow default bitwise copy construct
+        prismMatcher(const prismMatcher&) = delete;
+
+
     //- Destructor
     ~prismMatcher();
 
@@ -121,6 +116,12 @@ public:
             const label celli,
             cellShape& shape
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const prismMatcher&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
index 201b9125ce..8615b51859 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
@@ -61,15 +61,6 @@ class pyrMatcher
         static const label maxVertPerFace;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        pyrMatcher(const pyrMatcher&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pyrMatcher&) = delete;
-
-
 public:
 
     // Constructors
@@ -77,6 +68,10 @@ public:
         //- Construct null
         pyrMatcher();
 
+        //- Disallow default bitwise copy construct
+        pyrMatcher(const pyrMatcher&) = delete;
+
+
     //- Destructor
     ~pyrMatcher();
 
@@ -121,6 +116,12 @@ public:
             const label celli,
             cellShape& shape
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pyrMatcher&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
index e8bf185e5d..75ac91b47b 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
@@ -61,15 +61,6 @@ class tetMatcher
         static const label maxVertPerFace;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        tetMatcher(const tetMatcher&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const tetMatcher&) = delete;
-
-
 public:
 
     // Constructors
@@ -77,6 +68,10 @@ public:
         //- Construct null
         tetMatcher();
 
+        //- Disallow default bitwise copy construct
+        tetMatcher(const tetMatcher&) = delete;
+
+
     //- Destructor
     ~tetMatcher();
 
@@ -121,6 +116,12 @@ public:
             const label celli,
             cellShape& shape
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const tetMatcher&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
index 80e56c0a0e..6e013bab42 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
@@ -61,15 +61,6 @@ class tetWedgeMatcher
         static const label maxVertPerFace;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        tetWedgeMatcher(const tetWedgeMatcher&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const tetWedgeMatcher&) = delete;
-
-
 public:
 
     // Constructors
@@ -77,6 +68,10 @@ public:
         //- Construct null
         tetWedgeMatcher();
 
+        //- Disallow default bitwise copy construct
+        tetWedgeMatcher(const tetWedgeMatcher&) = delete;
+
+
     //- Destructor
     ~tetWedgeMatcher();
 
@@ -121,6 +116,12 @@ public:
             const label celli,
             cellShape& shape
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const tetWedgeMatcher&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
index 190cc1b449..e2a4e80ef9 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
@@ -61,15 +61,6 @@ class wedgeMatcher
         static const label maxVertPerFace;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        wedgeMatcher(const wedgeMatcher&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const wedgeMatcher&) = delete;
-
-
 public:
 
     // Constructors
@@ -77,6 +68,10 @@ public:
         //- Construct null
         wedgeMatcher();
 
+        //- Disallow default bitwise copy construct
+        wedgeMatcher(const wedgeMatcher&) = delete;
+
+
     //- Destructor
     ~wedgeMatcher();
 
@@ -121,6 +116,12 @@ public:
             const label celli,
             cellShape& shape
         );
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const wedgeMatcher&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
index e62e455494..4589f8fde3 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
@@ -65,12 +65,6 @@ class pointBoundaryMesh
         //- Calculate the geometry for the patches (transformation tensors etc.)
         void calcGeometry();
 
-        //- Disallow default bitwise copy construct
-        pointBoundaryMesh(const pointBoundaryMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointBoundaryMesh&) = delete;
-
 
 public:
 
@@ -87,6 +81,9 @@ public:
             const polyBoundaryMesh&
         );
 
+        //- Disallow default bitwise copy construct
+        pointBoundaryMesh(const pointBoundaryMesh&) = delete;
+
 
     // Member functions
 
@@ -117,6 +114,12 @@ public:
         //  after reordering to recalculate data (so call needs to be parallel
         //  sync in that case)
         void shuffle(const labelUList& newToOld, const bool validBoundary);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointBoundaryMesh&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.H b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
index 323b40c43e..cd72dace10 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
@@ -62,12 +62,6 @@ class pointMesh
         //- Map all fields
         void mapFields(const mapPolyMesh&);
 
-        //- Disallow default bitwise copy construct
-        pointMesh(const pointMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointMesh&) = delete;
-
 
 public:
 
@@ -84,6 +78,9 @@ public:
         //- Construct from polyMesh
         explicit pointMesh(const polyMesh& pMesh);
 
+        //- Disallow default bitwise copy construct
+        pointMesh(const pointMesh&) = delete;
+
 
     //- Destructor
     ~pointMesh();
@@ -147,6 +144,9 @@ public:
 
     // Member Operators
 
+        //- Disallow default bitwise assignment
+        void operator=(const pointMesh&) = delete;
+
         bool operator!=(const pointMesh& pm) const
         {
             return &pm != this;
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
index 88a58ee883..d3673e24ee 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
@@ -48,14 +48,6 @@ class pointBoundaryMeshMapper
 :
     public PtrList<pointPatchMapper>
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        pointBoundaryMeshMapper(const pointBoundaryMeshMapper&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointBoundaryMeshMapper&) = delete;
-
 
 public:
 
@@ -87,6 +79,15 @@ public:
                 );
             }
         }
+
+        //- Disallow default bitwise copy construct
+        pointBoundaryMeshMapper(const pointBoundaryMeshMapper&) = delete;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointBoundaryMeshMapper&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
index a5cea70c7b..0f9752a81d 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
@@ -89,13 +89,6 @@ class pointMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointMapper(const pointMapper&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointMapper&) = delete;
-
-
         //- Calculate addressing for mapping with inserted points
         void calcAddressing() const;
 
@@ -110,6 +103,9 @@ public:
         //- Construct from mapPolyMesh
         pointMapper(const pointMesh&, const mapPolyMesh& mpm);
 
+        //- Disallow default bitwise copy construct
+        pointMapper(const pointMapper&) = delete;
+
 
     //- Destructor
     virtual ~pointMapper();
@@ -150,6 +146,12 @@ public:
 
         //- Return list of inserted points
         const labelList& insertedObjectLabels() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointMapper&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
index f3720942c8..847a77717c 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
@@ -66,15 +66,6 @@ class pointMeshMapper
         pointBoundaryMeshMapper boundaryMap_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        pointMeshMapper(const pointMeshMapper&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointMeshMapper&) = delete;
-
-
 public:
 
     // Constructors
@@ -87,6 +78,9 @@ public:
             boundaryMap_(mesh, pointMap_, mpm)
         {}
 
+        //- Disallow default bitwise copy construct
+        pointMeshMapper(const pointMeshMapper&) = delete;
+
 
     // Member Functions
 
@@ -115,6 +109,12 @@ public:
         {
             return boundaryMap_;
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointMeshMapper&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
index bf48d12b33..c9f3b25df6 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
@@ -88,16 +88,6 @@ class pointPatchMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointPatchMapper
-        (
-            const pointPatchMapper&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointPatchMapper&) = delete;
-
-
         //- Calculate addressing for mapping with inserted cells
         void calcAddressing() const;
 
@@ -117,6 +107,12 @@ public:
             const mapPolyMesh& mpm
         );
 
+        //- Disallow default bitwise copy construct
+        pointPatchMapper
+        (
+            const pointPatchMapper&
+        );
+
 
     //- Destructor
     virtual ~pointPatchMapper();
@@ -149,6 +145,12 @@ public:
 
         //- Return interpolaion weights
         virtual const scalarListList& weights() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointPatchMapper&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
index fb4bb7d544..e84a8f4556 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
@@ -85,17 +85,6 @@ protected:
         virtual void updateMesh(PstreamBuffers&);
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        facePointPatch(const facePointPatch&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const facePointPatch&) = delete;
-
-
 public:
 
     // Declare friendship with the coupledPointPatches to allow them to extend
@@ -129,6 +118,9 @@ public:
             const pointBoundaryMesh&
         );
 
+        //- Disallow default bitwise copy construct
+        facePointPatch(const facePointPatch&) = delete;
+
 
     // Selectors
 
@@ -196,6 +188,12 @@ public:
         {
             return polyPatch_.pointNormals();
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const facePointPatch&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
index fb3c0eec30..03671f32d1 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
@@ -62,15 +62,6 @@ class pointPatch
         const pointBoundaryMesh& boundaryMesh_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        pointPatch(const pointPatch&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointPatch&) = delete;
-
-
 protected:
 
     // Protected Member Functions
@@ -119,6 +110,9 @@ public:
             boundaryMesh_(bm)
         {}
 
+        //- Disallow default bitwise copy construct
+        pointPatch(const pointPatch&) = delete;
+
 
     //- Destructor
     virtual ~pointPatch()
@@ -170,6 +164,12 @@ public:
             pointConstraint&
         ) const
         {}
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointPatch&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 291dcd691d..19def98494 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -304,13 +304,6 @@ class globalMeshData
             void calcGlobalCoPointSlaves() const;
 
 
-        //- Disallow default bitwise copy construct
-        globalMeshData(const globalMeshData&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const globalMeshData&) = delete;
-
-
 public:
 
     // Public class
@@ -351,6 +344,9 @@ public:
         //- Construct from mesh, derive rest (does parallel communication!)
         globalMeshData(const polyMesh& mesh);
 
+        //- Disallow default bitwise copy construct
+        globalMeshData(const globalMeshData&) = delete;
+
 
     //- Destructor
     ~globalMeshData();
@@ -614,6 +610,12 @@ public:
             //  full parallel analysis to determine shared points and
             //  boundaries.
             void updateMesh();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const globalMeshData&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
index 7612041e6e..f05164f72c 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
@@ -262,12 +262,6 @@ class globalPoints
             const bool mergeSeparated
         );
 
-        //- Disallow default bitwise copy construct
-        globalPoints(const globalPoints&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const globalPoints&) = delete;
-
 
 public:
 
@@ -301,6 +295,9 @@ public:
             const bool mergeSeparated
         );
 
+        //- Disallow default bitwise copy construct
+        globalPoints(const globalPoints&) = delete;
+
 
     // Member Functions
 
@@ -368,6 +365,12 @@ public:
             {
                 return procPoints_;
             }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const globalPoints&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
index a343c8a643..a18e772aaf 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
@@ -88,13 +88,6 @@ class cellMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellMapper(const cellMapper&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const cellMapper&) = delete;
-
-
         //- Calculate addressing for mapping with inserted cells
         void calcAddressing() const;
 
@@ -111,6 +104,9 @@ public:
         //- Construct from mapPolyMesh
         cellMapper(const mapPolyMesh& mpm);
 
+        //- Disallow default bitwise copy construct
+        cellMapper(const cellMapper&) = delete;
+
 
     //- Destructor
     virtual ~cellMapper();
@@ -149,6 +145,12 @@ public:
 
         //- Return list of inserted cells
         const virtual labelList& insertedObjectLabels() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const cellMapper&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
index 3e1e203c0f..f67e44b784 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
@@ -89,13 +89,6 @@ class faceMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faceMapper(const faceMapper&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const faceMapper&) = delete;
-
-
         //- Calculate addressing for mapping with inserted faces
         void calcAddressing() const;
 
@@ -112,6 +105,9 @@ public:
         //- Construct from mapPolyMesh
         faceMapper(const mapPolyMesh& mpm);
 
+        //- Disallow default bitwise copy construct
+        faceMapper(const faceMapper&) = delete;
+
 
     //- Destructor
     virtual ~faceMapper();
@@ -165,6 +161,12 @@ public:
 
         //- Return list of inserted faces
         virtual const labelList& insertedObjectLabels() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const faceMapper&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
index 26a411f06a..284ed51ab5 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
@@ -104,9 +104,6 @@ class mapDistributePolyMesh
 
         void calcPatchSizes();
 
-        //- Disallow default bitwise copy construct
-        mapDistributePolyMesh(const mapDistributePolyMesh&) = delete;
-
 
 public:
 
@@ -168,6 +165,9 @@ public:
         //- Construct from Istream
         mapDistributePolyMesh(Istream&);
 
+        //- Disallow default bitwise copy construct
+        mapDistributePolyMesh(const mapDistributePolyMesh&) = delete;
+
 
     // Member Functions
 
@@ -283,6 +283,7 @@ public:
                 NotImplemented;
             }
 
+
     // Member operators
 
         void operator=(const mapDistributePolyMesh&);
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index 4b126df4cb..2d5e14f95a 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -270,15 +270,6 @@ class mapPolyMesh
         autoPtr<scalarField> oldCellVolumesPtr_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        mapPolyMesh(const mapPolyMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const mapPolyMesh&) = delete;
-
-
 public:
 
     // Constructors
@@ -350,6 +341,10 @@ public:
             const bool reuse
         );
 
+        //- Disallow default bitwise copy construct
+        mapPolyMesh(const mapPolyMesh&) = delete;
+
+
     // Member Functions
 
         // Access
@@ -648,6 +643,11 @@ public:
                     return oldCellVolumesPtr_();
                 }
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const mapPolyMesh&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 7727aed31a..10537dcac5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -195,12 +195,6 @@ private:
 
     // Private Member Functions
 
-        //- Disallow construct as copy
-        polyMesh(const polyMesh&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const polyMesh&) = delete;
-
         //- Initialise the polyMesh from the primitive data
         void initMesh();
 
@@ -378,6 +372,9 @@ public:
             const bool syncPar = true
         );
 
+        //- Disallow construct as copy
+        polyMesh(const polyMesh&);
+
 
     //- Destructor
     virtual ~polyMesh();
@@ -750,6 +747,12 @@ public:
                 const point& p,
                 const cellDecomposition = CELL_TETS
             ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const polyMesh&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 6b69a8f147..be00e4d1d9 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -72,14 +72,6 @@ protected:
         const cellZoneMesh& zoneMesh_;
 
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        cellZone(const cellZone&) = delete;
-
-
 public:
 
     // Static data members
@@ -158,6 +150,10 @@ public:
             const cellZoneMesh&
         );
 
+        //- Disallow default bitwise copy construct
+        cellZone(const cellZone&) = delete;
+
+
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<cellZone> clone(const cellZoneMesh& zm) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index a1ae26b8c0..ab29ae2410 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -72,12 +72,6 @@ class faceZone
         static const word labelsName_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        faceZone(const faceZone&) = delete;
-
-
 protected:
 
     // Protected data
@@ -202,6 +196,10 @@ public:
             const faceZoneMesh&
         );
 
+        //- Disallow default bitwise copy construct
+        faceZone(const faceZone&) = delete;
+
+
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<faceZone> clone(const faceZoneMesh& zm) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 54f114a360..e690c33a4f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -72,10 +72,6 @@ protected:
         //- Reference to zone list
         const pointZoneMesh& zoneMesh_;
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        pointZone(const pointZone&) = delete;
 
 public:
 
@@ -155,6 +151,10 @@ public:
             const pointZoneMesh&
         );
 
+        //- Disallow default bitwise copy construct
+        pointZone(const pointZone&) = delete;
+
+
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<pointZone> clone(const pointZoneMesh& zm) const
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
index 51119f6e01..1d7caa1fab 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -82,9 +82,6 @@ protected:
         //- Construct the look-up map
         void calcLookupMap() const;
 
-        //- Disallow default bitwise copy construct
-        zone(const zone&) = delete;
-
 
 public:
 
@@ -137,6 +134,9 @@ public:
             const label index
         );
 
+        //- Disallow default bitwise copy construct
+        zone(const zone&) = delete;
+
 
     //- Destructor
     virtual ~zone();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 24c56baace..d3b82e4500 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -175,15 +175,6 @@ class primitiveMesh
             mutable vectorField* faceAreasPtr_;
 
 
-    // Private Member Functions
-
-        //- Disallow construct as copy
-        primitiveMesh(const primitiveMesh&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const primitiveMesh&) = delete;
-
-
         // Topological calculations
 
             //- Calculate cell shapes
@@ -446,6 +437,9 @@ public:
             const label nCells
         );
 
+        //- Disallow construct as copy
+        primitiveMesh(const primitiveMesh&);
+
 
     //- Destructor
     virtual ~primitiveMesh();
@@ -889,6 +883,12 @@ public:
 
             //- Clear all geometry and addressing unnecessary for CFD
             void clearOut();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const primitiveMesh&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
index f9a2e42ca8..64a94ff0ec 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
@@ -94,12 +94,6 @@ class walkPatch
         );
 
 
-        //- Disallow default bitwise copy construct
-        walkPatch(const walkPatch&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const walkPatch&) = delete;
-
 public:
 
     ClassName("walkPatch");
@@ -119,6 +113,9 @@ public:
             boolList& visited
         );
 
+        //- Disallow default bitwise copy construct
+        walkPatch(const walkPatch&) = delete;
+
 
     // Member Functions
 
@@ -132,6 +129,11 @@ public:
             return indexInFace_;
         }
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const walkPatch&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index ffe8ed30b3..4a6760fb64 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -104,9 +104,6 @@ class CSV
         //- Read the next value from the split string
         Type readValue(const List<string>&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const CSV<Type>&) = delete;
-
 
 public:
 
@@ -138,6 +135,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const CSV<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index 95c9ead070..fbe8723467 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -64,12 +64,6 @@ class Constant
         Type value_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const Constant<Type>&) = delete;
-
-
 public:
 
     // Runtime type information
@@ -123,6 +117,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Constant<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 14018c303b..ce2eb8327d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -63,11 +63,6 @@ class Function1
 :
     public tmp<Function1<Type>>::refCount
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const Function1<Type>&) = delete;
-
 
 protected:
 
@@ -166,6 +161,12 @@ public:
 
             //- Write in dictionary format
             virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Function1<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
index d4f0b5a682..f3b1a93bbf 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
@@ -58,11 +58,6 @@ class OneConstant
 :
     public Function1<Type>
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const OneConstant<Type>&) = delete;
-
 
 public:
 
@@ -109,6 +104,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const OneConstant<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
index 2044466bc7..6698787970 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
@@ -74,12 +74,6 @@ class Polynomial
         bool canIntegrate_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const Polynomial<Type>&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -124,6 +118,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Polynomial<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
index 891050e957..f85dc6fc15 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
@@ -150,9 +150,6 @@ class Scale
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
-        void operator=(const Scale<Type>&) = delete;
-
 
 public:
 
@@ -184,6 +181,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Scale<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index cacfa51f81..79b8f06dae 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -116,9 +116,6 @@ class Sine
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
-        void operator=(const Sine<Type>&) = delete;
-
 
 public:
 
@@ -150,6 +147,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Sine<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
index 14f8f8bfc3..d573e19400 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -123,9 +123,6 @@ class Square
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
-        void operator=(const Square<Type>&) = delete;
-
 
 public:
 
@@ -157,6 +154,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Square<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index 1a3524bcd8..41f4b3f11a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -66,11 +66,6 @@ class Table
 :
     public TableBase<Type>
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const Table<Type>&) = delete;
-
 
 public:
 
@@ -89,6 +84,12 @@ public:
 
     //- Destructor
     virtual ~Table();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Table<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index b3496cb184..40c31b33db 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -81,12 +81,6 @@ class TableFile
         fileName fName_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const TableFile<Type>&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -110,6 +104,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const TableFile<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
index ed59936ad8..c5822430ca 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
@@ -61,11 +61,6 @@ class Uniform
 :
     public Constant<Type>
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const Uniform<Type>&) = delete;
-
 
 public:
 
@@ -77,6 +72,12 @@ public:
 
         //- Construct from entry name and dictionary
         Uniform(const word& entryName, const dictionary& dict);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Uniform<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
index 4348adc79f..3073ab9d9b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
@@ -58,11 +58,6 @@ class ZeroConstant
 :
     public Function1<Type>
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const ZeroConstant<Type>&) = delete;
-
 
 public:
 
@@ -90,6 +85,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const ZeroConstant<Type>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
index 8a89868941..2dca809ca2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
@@ -56,11 +56,6 @@ class halfCosineRamp
 :
     public ramp
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const halfCosineRamp&) = delete;
-
 
 public:
 
@@ -86,6 +81,12 @@ public:
 
         //- Return value for time t
         virtual inline scalar value(const scalar t) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const halfCosineRamp&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
index 41f53c8b41..e1f5783042 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
@@ -56,11 +56,6 @@ class linearRamp
 :
     public ramp
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const linearRamp&) = delete;
-
 
 public:
 
@@ -86,6 +81,12 @@ public:
 
         //- Return value for time t
         virtual inline scalar value(const scalar t) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const linearRamp&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
index 7f02f363f7..82f7f7bb03 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
@@ -56,11 +56,6 @@ class quadraticRamp
 :
     public ramp
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const quadraticRamp&) = delete;
-
 
 public:
 
@@ -86,6 +81,12 @@ public:
 
         //- Return value for time t
         virtual inline scalar value(const scalar t) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const quadraticRamp&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
index d9a9d7b602..ab7d83d782 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
@@ -56,11 +56,6 @@ class quarterCosineRamp
 :
     public ramp
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const quarterCosineRamp&) = delete;
-
 
 public:
 
@@ -86,6 +81,12 @@ public:
 
         //- Return value for time t
         virtual inline scalar value(const scalar t) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const quarterCosineRamp&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
index b5c8c3373a..6f5c8a0594 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
@@ -56,11 +56,6 @@ class quarterSineRamp
 :
     public ramp
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const quarterSineRamp&) = delete;
-
 
 public:
 
@@ -86,6 +81,12 @@ public:
 
         //- Return value for time t
         virtual inline scalar value(const scalar t) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const quarterSineRamp&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
index b093f727b0..19d3e103c2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
@@ -108,9 +108,6 @@ private:
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
-        void operator=(const ramp&) = delete;
-
 
 public:
 
@@ -135,6 +132,12 @@ public:
 
         //- Write in dictionary format
         virtual void writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const ramp&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
index d04a7d927b..d57e38f091 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
@@ -150,12 +150,6 @@ private:
             const labelPair& patchTrafo
         ) const;
 
-        //- Disallow default bitwise copy construct
-        globalIndexAndTransform(const globalIndexAndTransform&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const globalIndexAndTransform&) = delete;
-
 
 public:
 
@@ -168,6 +162,9 @@ public:
         //- Construct from components
         globalIndexAndTransform(const polyMesh& mesh);
 
+        //- Disallow default bitwise copy construct
+        globalIndexAndTransform(const globalIndexAndTransform&) = delete;
+
 
     // Member Functions
 
@@ -281,6 +278,11 @@ public:
             const point& pt
         ) const;
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const globalIndexAndTransform&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index 2a793295cf..e75cfd12e5 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -51,16 +51,16 @@ class NullObject
     NullObject()
     {}
 
+public:
+
+    //- The unique null object
+    static const NullObject nullObject;
+
     //- Disallow default bitwise copy construct
     NullObject(const NullObject&) = delete;
 
     //- Disallow default bitwise assignment
     void operator=(const NullObject&) = delete;
-
-public:
-
-    //- The unique null object
-    static const NullObject nullObject;
 };
 
 
diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.H b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
index da229b3e5f..1632fe676e 100644
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.H
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
@@ -51,11 +51,6 @@ namespace Foam
 
 class subModelBase
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const subModelBase&) = delete;
-
 
 protected:
 
@@ -200,6 +195,12 @@ public:
 
             //- Write
             virtual void write(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const subModelBase&) = delete;
 };