From b448d4cc73cd8510bbdee7710556f14bdba1a222 Mon Sep 17 00:00:00 2001 From: Jakub Knir Date: Wed, 9 Dec 2020 11:41:13 +0000 Subject: [PATCH] codeTemplates/BC: Updated constructors to disallow copy without setting internal field reference --- etc/codeTemplates/BC/BC.C | 20 +------------------- etc/codeTemplates/BC/BC.H | 11 +---------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C index 576d741197..22266fa5bb 100644 --- a/etc/codeTemplates/BC/BC.C +++ b/etc/codeTemplates/BC/BC.C @@ -74,7 +74,7 @@ CONSTRUCT : PARENT(p, iF), scalarData_(dict.lookup("scalarData")), - data_(pTraits(dict.lookup("data"))), + data_(dict.lookup("data")), fieldData_("fieldData", dict, p.size()), timeVsData_(Function1::New("timeVsData", dict)), wordData_(dict.lookupOrDefault("wordName", "wordDefault")), @@ -121,24 +121,6 @@ CONSTRUCT {} -template -Foam::CLASS:: -CONSTRUCT -( - const CLASS& ptf -) -: - PARENT(ptf), - scalarData_(ptf.scalarData_), - data_(ptf.data_), - fieldData_(ptf.fieldData_), - timeVsData_(ptf.timeVsData_, false), - wordData_(ptf.wordData_), - labelData_(-1), - boolData_(ptf.boolData_) -{} - - template Foam::CLASS:: CONSTRUCT diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H index b5596f8f48..dada83670a 100644 --- a/etc/codeTemplates/BC/BC.H +++ b/etc/codeTemplates/BC/BC.H @@ -161,16 +161,7 @@ public: CONSTRUCT ( const CLASS& - ); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp - ( - new CLASS(*this) - ); - } + ) = delete; //- Copy constructor setting internal field reference CONSTRUCT