zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: adjust codeTemplates to use '= delete'

Browse Source
This commit is contained in:
Mark Olesen
2018-04-19 07:38:31 +02:00
parent 367ddb8f05
commit ef922b6917
4 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
etc/codeTemplates/dynamicCode/functionObjectTemplate.H
View File

@ -44,7 +44,7 @@ ${codeInclude}
namespace Foam namespace Foam
{ {
// Forward declaration of classes // Forward declarations
class fvMesh; class fvMesh;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
@ -66,11 +66,11 @@ class ${typeName}FunctionObject
const fvMesh& mesh() const; const fvMesh& mesh() const;
//- Disallow default bitwise copy construct //- No copy construct
${typeName}FunctionObject(const ${typeName}FunctionObject&); ${typeName}FunctionObject(const ${typeName}FunctionObject&) = delete;
//- Disallow default bitwise assignment //- No copy assignment
void operator=(const ${typeName}FunctionObject&); void operator=(const ${typeName}FunctionObject&) = delete;
public: public:
@ -97,7 +97,7 @@ public:
// Member Functions // Member Functions
//- Read the system calls //- Read the system calls
virtual bool read(const dictionary&); virtual bool read(const dictionary& dict);
//- Execute the "executeCalls" at each time-step //- Execute the "executeCalls" at each time-step
virtual bool execute(); virtual bool execute();

6
etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
View File

@ -91,10 +91,10 @@ class FUNCTIONOBJECT
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- No copy construct
FUNCTIONOBJECT(const FUNCTIONOBJECT&); FUNCTIONOBJECT(const FUNCTIONOBJECT&);
//- Disallow default bitwise assignment //- No copy assignment
void operator=(const FUNCTIONOBJECT&); void operator=(const FUNCTIONOBJECT&);
@ -122,7 +122,7 @@ public:
// Member Functions // Member Functions
//- Read the FUNCTIONOBJECT data //- Read the FUNCTIONOBJECT data
virtual bool read(const dictionary&); virtual bool read(const dictionary& dict);
//- Execute, currently does nothing //- Execute, currently does nothing
virtual bool execute(); virtual bool execute();

13
etc/codeTemplates/source/_Template.H
View File

@ -43,11 +43,10 @@ SourceFiles
namespace Foam namespace Foam
{ {
// Forward declaration of classes // Forward declarations
class Istream; class Istream;
class Ostream; class Ostream;
// Forward declaration of friend functions and operators
class CLASSNAME; class CLASSNAME;
Istream& operator>>(Istream&, CLASSNAME&); Istream& operator>>(Istream&, CLASSNAME&);
Ostream& operator<<(Ostream&, const CLASSNAME&); Ostream& operator<<(Ostream&, const CLASSNAME&);
@ -69,11 +68,11 @@ class CLASSNAME
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- No copy construct
CLASSNAME(const CLASSNAME&); CLASSNAME(const CLASSNAME&) = delete;
//- Disallow default bitwise assignment //- No copy assignment
void operator=(const CLASSNAME&); void operator=(const CLASSNAME&) = delete;
public: public:
@ -93,7 +92,7 @@ public:
CLASSNAME(const dataType& data); CLASSNAME(const dataType& data);
//- Construct from Istream //- Construct from Istream
CLASSNAME(Istream&); CLASSNAME(Istream& is);
//- Construct as copy //- Construct as copy
CLASSNAME(const CLASSNAME&); CLASSNAME(const CLASSNAME&);

15
etc/codeTemplates/template/_TemplateTemplate.H
View File

@ -43,12 +43,9 @@ SourceFiles
namespace Foam namespace Foam
{ {
// Forward declaration of classes // Forward declarations
class someClass; class someClass;
// Forward declaration of friend functions and operators
template<TemplateClassArgument> template<TemplateClassArgument>
class CLASSNAME; class CLASSNAME;
@ -75,11 +72,11 @@ class CLASSNAME
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- No copy construct
CLASSNAME(const CLASSNAME<TemplateArgument>&); CLASSNAME(const CLASSNAME<TemplateArgument>&) = delete;
//- Disallow default bitwise assignment //- No copy assignment
void operator=(const CLASSNAME<TemplateArgument>&); void operator=(const CLASSNAME<TemplateArgument>&) = delete;
public: public:
@ -99,7 +96,7 @@ public:
CLASSNAME(const dataType& data); CLASSNAME(const dataType& data);
//- Construct from Istream //- Construct from Istream
CLASSNAME(Istream&); CLASSNAME(Istream& is);
//- Construct as copy //- Construct as copy
CLASSNAME(const CLASSNAME<TemplateArgument>&); CLASSNAME(const CLASSNAME<TemplateArgument>&);