From 8ac56401f7a773bd367556476f246ec0c5fe5154 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 29 Jul 2021 11:55:18 +0200 Subject: [PATCH 1/2] [Misc][clang-tidy] make deleted function public --- .../plugins/UniformMagneticFieldESProducer.h | 7 +++---- PhysicsTools/CondLiteIO/interface/RecordWriter.h | 9 +++++---- .../TrackAssociator/plugins/DetIdAssociatorMaker.h | 6 ++---- .../TrackFitters/interface/KFTrajectoryFitter.h | 4 ++-- Utilities/StorageFactory/interface/LocalFileSystem.h | 9 +++++---- Utilities/StorageFactory/interface/Storage.h | 10 +++++----- Utilities/StorageFactory/interface/StorageAccount.h | 2 +- .../EcalHits/interface/EcalSimHitsValidProducer.h | 5 ++--- Validation/Geometry/src/MaterialBudgetVolume.cc | 5 ++--- Validation/HcalHits/interface/SimG4HcalValidation.h | 5 ++--- 10 files changed, 29 insertions(+), 33 deletions(-) diff --git a/MagneticField/UniformEngine/plugins/UniformMagneticFieldESProducer.h b/MagneticField/UniformEngine/plugins/UniformMagneticFieldESProducer.h index d7e0d4bd899f2..d501ca6dac337 100644 --- a/MagneticField/UniformEngine/plugins/UniformMagneticFieldESProducer.h +++ b/MagneticField/UniformEngine/plugins/UniformMagneticFieldESProducer.h @@ -20,14 +20,13 @@ namespace magneticfield { class UniformMagneticFieldESProducer : public edm::ESProducer { public: UniformMagneticFieldESProducer(const edm::ParameterSet& pset); - - std::unique_ptr produce(const IdealMagneticFieldRecord&); - - private: // forbid copy ctor and assignment op. UniformMagneticFieldESProducer(const UniformMagneticFieldESProducer&) = delete; const UniformMagneticFieldESProducer& operator=(const UniformMagneticFieldESProducer&) = delete; + std::unique_ptr produce(const IdealMagneticFieldRecord&); + + private: float value; }; } // namespace magneticfield diff --git a/PhysicsTools/CondLiteIO/interface/RecordWriter.h b/PhysicsTools/CondLiteIO/interface/RecordWriter.h index f646b1093cfd7..295c873817780 100644 --- a/PhysicsTools/CondLiteIO/interface/RecordWriter.h +++ b/PhysicsTools/CondLiteIO/interface/RecordWriter.h @@ -33,6 +33,11 @@ namespace fwlite { class RecordWriter { public: RecordWriter(const char* iName, TFile* iFile); + + RecordWriter(const RecordWriter&) = delete; // stop default + + const RecordWriter& operator=(const RecordWriter&) = delete; // stop default + virtual ~RecordWriter(); struct DataBuffer { @@ -53,10 +58,6 @@ namespace fwlite { void write(); private: - RecordWriter(const RecordWriter&) = delete; // stop default - - const RecordWriter& operator=(const RecordWriter&) = delete; // stop default - // ---------- member data -------------------------------- TTree* tree_; edm::ESRecordAuxiliary aux_; diff --git a/TrackingTools/TrackAssociator/plugins/DetIdAssociatorMaker.h b/TrackingTools/TrackAssociator/plugins/DetIdAssociatorMaker.h index cd73eec1451ef..7fea9ae922a17 100644 --- a/TrackingTools/TrackAssociator/plugins/DetIdAssociatorMaker.h +++ b/TrackingTools/TrackAssociator/plugins/DetIdAssociatorMaker.h @@ -29,6 +29,8 @@ class DetIdAssociatorRecord; class DetIdAssociatorMaker { public: DetIdAssociatorMaker() = default; + DetIdAssociatorMaker(const DetIdAssociatorMaker&) = delete; + const DetIdAssociatorMaker& operator=(const DetIdAssociatorMaker&) = delete; virtual ~DetIdAssociatorMaker() = default; // ---------- const member functions --------------------- @@ -39,10 +41,6 @@ class DetIdAssociatorMaker { // ---------- member functions --------------------------- private: - DetIdAssociatorMaker(const DetIdAssociatorMaker&) = delete; - - const DetIdAssociatorMaker& operator=(const DetIdAssociatorMaker&) = delete; - // ---------- member data -------------------------------- }; diff --git a/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h b/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h index ffe616acccb59..3101552c59a62 100644 --- a/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h +++ b/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h @@ -63,6 +63,8 @@ class KFTrajectoryFitter final : public TrajectoryFitter { theGeometry = &dummyGeometry; } + KFTrajectoryFitter(KFTrajectoryFitter const&) = delete; + ~KFTrajectoryFitter() override { if (owner) { delete thePropagator; @@ -94,8 +96,6 @@ class KFTrajectoryFitter final : public TrajectoryFitter { void setHitCloner(TkCloner const* hc) override { theHitCloner = hc; } private: - KFTrajectoryFitter(KFTrajectoryFitter const&) = delete; - static const DetLayerGeometry dummyGeometry; const Propagator* thePropagator; const TrajectoryStateUpdator* theUpdator; diff --git a/Utilities/StorageFactory/interface/LocalFileSystem.h b/Utilities/StorageFactory/interface/LocalFileSystem.h index 94544783e3586..f6405b525f1bd 100644 --- a/Utilities/StorageFactory/interface/LocalFileSystem.h +++ b/Utilities/StorageFactory/interface/LocalFileSystem.h @@ -13,6 +13,11 @@ class LocalFileSystem { public: LocalFileSystem(void); + + // undefined, no semantics + LocalFileSystem(LocalFileSystem &) = delete; + void operator=(LocalFileSystem &) = delete; + ~LocalFileSystem(void); bool isLocalPath(const std::string &path) const; @@ -27,10 +32,6 @@ class LocalFileSystem { std::vector fs_; std::vector fstypes_; - - // undefined, no semantics - LocalFileSystem(LocalFileSystem &) = delete; - void operator=(LocalFileSystem &) = delete; }; #endif // STORAGE_FACTORY_LOCAL_FILE_SYSTEM_H diff --git a/Utilities/StorageFactory/interface/Storage.h b/Utilities/StorageFactory/interface/Storage.h index 073f55bbc8cc1..e749c507c9ac6 100644 --- a/Utilities/StorageFactory/interface/Storage.h +++ b/Utilities/StorageFactory/interface/Storage.h @@ -22,6 +22,11 @@ class Storage : public virtual IOInput, public virtual IOOutput { enum Relative { SET, CURRENT, END }; Storage(void); + + // undefined, no semantics + Storage(const Storage &) = delete; + Storage &operator=(const Storage &) = delete; + ~Storage(void) override; using IOInput::read; @@ -48,11 +53,6 @@ class Storage : public virtual IOInput, public virtual IOOutput { virtual void flush(void); virtual void close(void); - -private: - // undefined, no semantics - Storage(const Storage &) = delete; - Storage &operator=(const Storage &) = delete; }; #endif // STORAGE_FACTORY_STORAGE_H diff --git a/Utilities/StorageFactory/interface/StorageAccount.h b/Utilities/StorageFactory/interface/StorageAccount.h index 09075f8203160..e50508b3e65fe 100644 --- a/Utilities/StorageFactory/interface/StorageAccount.h +++ b/Utilities/StorageFactory/interface/StorageAccount.h @@ -104,12 +104,12 @@ class StorageAccount { class StorageClassToken { public: StorageClassToken(StorageClassToken const&) = default; + StorageClassToken() = delete; int value() const { return m_value; } friend class StorageAccount; private: - StorageClassToken() = delete; explicit StorageClassToken(int iValue) : m_value{iValue} {} int m_value; diff --git a/Validation/EcalHits/interface/EcalSimHitsValidProducer.h b/Validation/EcalHits/interface/EcalSimHitsValidProducer.h index f72540128cf60..9d77fb54bbeb0 100644 --- a/Validation/EcalHits/interface/EcalSimHitsValidProducer.h +++ b/Validation/EcalHits/interface/EcalSimHitsValidProducer.h @@ -31,14 +31,13 @@ class EcalSimHitsValidProducer : public SimProducer, public: EcalSimHitsValidProducer(const edm::ParameterSet &); + EcalSimHitsValidProducer(const EcalSimHitsValidProducer &) = delete; // stop default + const EcalSimHitsValidProducer &operator=(const EcalSimHitsValidProducer &) = delete; // stop default ~EcalSimHitsValidProducer() override; void produce(edm::Event &, const edm::EventSetup &) override; private: - EcalSimHitsValidProducer(const EcalSimHitsValidProducer &) = delete; // stop default - const EcalSimHitsValidProducer &operator=(const EcalSimHitsValidProducer &) = delete; // stop default - void update(const BeginOfEvent *) override; void update(const G4Step *) override; void update(const EndOfEvent *) override; diff --git a/Validation/Geometry/src/MaterialBudgetVolume.cc b/Validation/Geometry/src/MaterialBudgetVolume.cc index ce6d5b900e06d..6357e4640d8c2 100644 --- a/Validation/Geometry/src/MaterialBudgetVolume.cc +++ b/Validation/Geometry/src/MaterialBudgetVolume.cc @@ -41,6 +41,8 @@ class MaterialBudgetVolume : public SimProducer, public Observer { public: MaterialBudgetVolume(const edm::ParameterSet& p); + MaterialBudgetVolume(const MaterialBudgetVolume&) = delete; // stop default + const MaterialBudgetVolume& operator=(const MaterialBudgetVolume&) = delete; ~MaterialBudgetVolume() override {} void produce(edm::Event&, const edm::EventSetup&) override; @@ -51,9 +53,6 @@ class MaterialBudgetVolume : public SimProducer, }; private: - MaterialBudgetVolume(const MaterialBudgetVolume&) = delete; // stop default - const MaterialBudgetVolume& operator=(const MaterialBudgetVolume&) = delete; - // observer classes void update(const BeginOfRun* run) override; void update(const BeginOfEvent* evt) override; diff --git a/Validation/HcalHits/interface/SimG4HcalValidation.h b/Validation/HcalHits/interface/SimG4HcalValidation.h index 348ee1ec27384..f6dc9f9e2e300 100644 --- a/Validation/HcalHits/interface/SimG4HcalValidation.h +++ b/Validation/HcalHits/interface/SimG4HcalValidation.h @@ -39,14 +39,13 @@ class SimG4HcalValidation : public SimProducer, public Observer { public: SimG4HcalValidation(const edm::ParameterSet &p); + SimG4HcalValidation(const SimG4HcalValidation &) = delete; // stop default + const SimG4HcalValidation &operator=(const SimG4HcalValidation &) = delete; ~SimG4HcalValidation() override; void produce(edm::Event &, const edm::EventSetup &) override; private: - SimG4HcalValidation(const SimG4HcalValidation &) = delete; // stop default - const SimG4HcalValidation &operator=(const SimG4HcalValidation &) = delete; - void init(); // observer classes From f6ca115371907b548198dd17f42d49dbbeda4cb2 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 29 Jul 2021 11:55:50 +0200 Subject: [PATCH 2/2] code-format --- Utilities/StorageFactory/interface/LocalFileSystem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/StorageFactory/interface/LocalFileSystem.h b/Utilities/StorageFactory/interface/LocalFileSystem.h index f6405b525f1bd..6dc7e30ebf1aa 100644 --- a/Utilities/StorageFactory/interface/LocalFileSystem.h +++ b/Utilities/StorageFactory/interface/LocalFileSystem.h @@ -13,7 +13,7 @@ class LocalFileSystem { public: LocalFileSystem(void); - + // undefined, no semantics LocalFileSystem(LocalFileSystem &) = delete; void operator=(LocalFileSystem &) = delete;