Merge remote-tracking branch 'origin/develop' into develop-pre-release

src/OpenFOAM/db/functionObjects/functionObject/functionObject.H

@@ -147,10 +147,10 @@ class functionObject
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionObject(const functionObject&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionObject&) = delete;
 
 

src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C

@@ -305,7 +305,7 @@ bool Foam::functionObjectList::readFunctionObject
     else if (args.size() > 1)
     {
         funcDict.set("fields", args);
-        requiredFields.insertMany(args);
+        requiredFields.insert(args);
     }
     else if (funcDict.found("field"))
     {
@@ -313,7 +313,7 @@ bool Foam::functionObjectList::readFunctionObject
     }
     else if (funcDict.found("fields"))
     {
-        requiredFields.insertMany(wordReList(funcDict.lookup("fields")));
+        requiredFields.insert(wordReList(funcDict.lookup("fields")));
     }
 
     // Insert named arguments

src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H

@@ -104,10 +104,10 @@ class functionObjectList
         //- configuration files, add to the given map and recurse
         static void listDir(const fileName& dir, wordHashSet& foMap);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionObjectList(const functionObjectList&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionObjectList&) = delete;
 
 

src/OpenFOAM/db/functionObjects/logFiles/logFiles.H

@@ -86,11 +86,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        logFiles(const logFiles&);
+        //- No copy construct
+        logFiles(const logFiles&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const logFiles&);
+        //- No copy assignment
+        void operator=(const logFiles&) = delete;
 
 
 public:

src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H

@@ -135,10 +135,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         regionFunctionObject(const regionFunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const regionFunctionObject&) = delete;
 
 

src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H

@@ -77,10 +77,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         stateFunctionObject(const stateFunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const stateFunctionObject&) = delete;
 
 

src/OpenFOAM/db/functionObjects/timeControl/timeControl.H

@@ -95,11 +95,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        timeControl(const timeControl&);
+        //- No copy construct
+        timeControl(const timeControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const timeControl&);
+        //- No copy assignment
+        void operator=(const timeControl&) = delete;
 
 
 public:

src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H

@@ -151,11 +151,11 @@ class timeControl
             const bool rampDirectionUp
         );
 
-        //- Disallow default bitwise copy construct
-        timeControl(const timeControl&);
+        //- No copy construct
+        timeControl(const timeControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const timeControl&);
+        //- No copy assignment
+        void operator=(const timeControl&) = delete;
 
 
 public:

src/OpenFOAM/db/functionObjects/writeFile/writeFile.H

@@ -108,11 +108,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        writeFile(const writeFile&);
+        //- No copy construct
+        writeFile(const writeFile&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const writeFile&);
+        //- No copy assignment
+        void operator=(const writeFile&) = delete;
 
 
 public: