src/OpenFOAM: Moved the deleted bitwise copy and assignment declarations into public section of the class

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;
 };
 
 

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;
 

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

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

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };
 
 

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;
 };