From a6ae9d95b9b1f7e18129f52041fe2fece04ca31b Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Thu, 29 Jul 2021 10:10:20 +0200
Subject: [PATCH 1/2] [Cond][clang-tidy] make deleted function public

---
 CondCore/CondDB/plugins/XMLAuthenticationService.h        | 8 +++-----
 CondCore/ESSources/interface/DataProxy.h                  | 5 ++---
 CondFormats/DTObjects/interface/DTBufferTree.h            | 5 ++---
 CondFormats/DTObjects/interface/DTCCBConfig.h             | 5 ++---
 CondFormats/DTObjects/interface/DTDeadFlag.h              | 5 ++---
 CondFormats/DTObjects/interface/DTHVStatus.h              | 5 ++---
 CondFormats/DTObjects/interface/DTLVStatus.h              | 5 ++---
 CondFormats/DTObjects/interface/DTMtime.h                 | 5 ++---
 CondFormats/DTObjects/interface/DTPerformance.h           | 5 ++---
 CondFormats/DTObjects/interface/DTRangeT0.h               | 5 ++---
 CondFormats/DTObjects/interface/DTReadOutMapping.h        | 5 ++---
 CondFormats/DTObjects/interface/DTStatusFlag.h            | 5 ++---
 CondFormats/DTObjects/interface/DTTPGParameters.h         | 3 +--
 CondFormats/DTObjects/interface/DTTtrig.h                 | 5 ++---
 .../JetMETObjects/interface/FactorizedJetCorrector.h      | 5 +++--
 .../interface/FactorizedJetCorrectorCalculator.h          | 4 ++--
 .../JetMETObjects/interface/JetCorrectionUncertainty.h    | 4 ++--
 .../interface/SimpleJetCorrectionUncertainty.h            | 4 ++--
 CondTools/DT/interface/DTKeyedConfigCache.h               | 5 ++---
 CondTools/Hcal/interface/StreamOutFormatTarget.h          | 4 ++--
 CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc         | 2 +-
 CondTools/L1Trigger/interface/OMDSReader.h                | 8 ++++----
 22 files changed, 46 insertions(+), 61 deletions(-)

diff --git a/CondCore/CondDB/plugins/XMLAuthenticationService.h b/CondCore/CondDB/plugins/XMLAuthenticationService.h
index 84ac58851209f..7afafb687677b 100644
--- a/CondCore/CondDB/plugins/XMLAuthenticationService.h
+++ b/CondCore/CondDB/plugins/XMLAuthenticationService.h
@@ -28,6 +28,9 @@ namespace cond {
     public:
       /// Constructor
       DataSourceEntry(const std::string& serviceName, const std::string& connectionName);
+      DataSourceEntry() = delete;
+      DataSourceEntry(const DataSourceEntry&) = delete;
+      DataSourceEntry& operator=(const DataSourceEntry&) = delete;
 
       /// Destructor
       ~DataSourceEntry();
@@ -65,11 +68,6 @@ namespace cond {
 
       /// The structure with the authentication data for the various roles
       std::map<std::string, coral::AuthenticationCredentials*> m_data;
-
-    private:
-      DataSourceEntry() = delete;
-      DataSourceEntry(const DataSourceEntry&) = delete;
-      DataSourceEntry& operator=(const DataSourceEntry&) = delete;
     };
 
     /**
diff --git a/CondCore/ESSources/interface/DataProxy.h b/CondCore/ESSources/interface/DataProxy.h
index 9e0e032f1f12f..4a84db7e4921a 100644
--- a/CondCore/ESSources/interface/DataProxy.h
+++ b/CondCore/ESSources/interface/DataProxy.h
@@ -31,6 +31,8 @@ class DataProxy : public edm::eventsetup::ESSourceDataProxyTemplate<DataT> {
                      edm::SerialTaskQueue* iQueue,
                      std::mutex* iMutex)
       : edm::eventsetup::ESSourceDataProxyTemplate<DataT>(iQueue, iMutex), m_data{pdata} {}
+  //DataProxy(); // stop default
+  const DataProxy& operator=(const DataProxy&) = delete;  // stop default
 
   // ---------- const member functions ---------------------
 
@@ -46,9 +48,6 @@ class DataProxy : public edm::eventsetup::ESSourceDataProxyTemplate<DataT> {
   DataT const* fetch() const final { return &(*m_data)(); }
 
 private:
-  //DataProxy(); // stop default
-  const DataProxy& operator=(const DataProxy&) = delete;  // stop default
-
   void initializeForNewIOV() override { m_data->initializeForNewIOV(); }
 
   // ---------- member data --------------------------------
diff --git a/CondFormats/DTObjects/interface/DTBufferTree.h b/CondFormats/DTObjects/interface/DTBufferTree.h
index 573c1c325fb99..a13cac0caa987 100644
--- a/CondFormats/DTObjects/interface/DTBufferTree.h
+++ b/CondFormats/DTObjects/interface/DTBufferTree.h
@@ -44,6 +44,8 @@ class DTBufferTree {
   typedef typename std::vector<Key>::const_iterator ElementKey;
 
   DTBufferTree();
+  DTBufferTree(DTBufferTree const&) = delete;
+  DTBufferTree& operator=(DTBufferTree const&) = delete;
   virtual ~DTBufferTree();
 
   void clear();
@@ -56,9 +58,6 @@ class DTBufferTree {
   int find(const Key& k, typename DTBufferTreeTrait<Content>::outputTypeOfNonConstFind& cont);
 
 private:
-  DTBufferTree(DTBufferTree const&) = delete;
-  DTBufferTree& operator=(DTBufferTree const&) = delete;
-
   typedef DTBufferTree<Key, Content> map_node;
   typedef typename std::map<Key, DTBufferTree<Key, Content>*> map_cont;
   typedef typename std::map<Key, DTBufferTree<Key, Content>*>::const_iterator map_iter;
diff --git a/CondFormats/DTObjects/interface/DTCCBConfig.h b/CondFormats/DTObjects/interface/DTCCBConfig.h
index d7d096a6926ae..f82b680aa4b86 100644
--- a/CondFormats/DTObjects/interface/DTCCBConfig.h
+++ b/CondFormats/DTObjects/interface/DTCCBConfig.h
@@ -60,6 +60,8 @@ class DTConfigKey {
 class DTCCBConfig {
 public:
   DTCCBConfig();
+  DTCCBConfig(DTCCBConfig const&) = delete;
+  DTCCBConfig& operator=(DTCCBConfig const&) = delete;
   DTCCBConfig(const std::string& version);
 
   virtual ~DTCCBConfig();
@@ -96,9 +98,6 @@ class DTCCBConfig {
   void initialize();
 
 private:
-  DTCCBConfig(DTCCBConfig const&) = delete;
-  DTCCBConfig& operator=(DTCCBConfig const&) = delete;
-
   int timeStamp;
   std::string dataVersion;
   std::vector<DTConfigKey> fullConfigKey;
diff --git a/CondFormats/DTObjects/interface/DTDeadFlag.h b/CondFormats/DTObjects/interface/DTDeadFlag.h
index 1bfe26e10202b..b23c353764514 100644
--- a/CondFormats/DTObjects/interface/DTDeadFlag.h
+++ b/CondFormats/DTObjects/interface/DTDeadFlag.h
@@ -68,6 +68,8 @@ class DTDeadFlag {
   /** Constructor
    */
   DTDeadFlag();
+  DTDeadFlag(DTDeadFlag const&) = delete;
+  DTDeadFlag& operator=(DTDeadFlag const&) = delete;
   DTDeadFlag(const std::string& version);
 
   /** Destructor
@@ -171,9 +173,6 @@ class DTDeadFlag {
   void initialize();
 
 private:
-  DTDeadFlag(DTDeadFlag const&) = delete;
-  DTDeadFlag& operator=(DTDeadFlag const&) = delete;
-
   std::string dataVersion;
 
   std::vector<std::pair<DTDeadFlagId, DTDeadFlagData> > dataList;
diff --git a/CondFormats/DTObjects/interface/DTHVStatus.h b/CondFormats/DTObjects/interface/DTHVStatus.h
index 739cc9e75f8ed..dc6817fda594b 100644
--- a/CondFormats/DTObjects/interface/DTHVStatus.h
+++ b/CondFormats/DTObjects/interface/DTHVStatus.h
@@ -72,6 +72,8 @@ class DTHVStatus {
   /** Constructor
    */
   DTHVStatus();
+  DTHVStatus(DTHVStatus const&) = delete;
+  DTHVStatus& operator=(DTHVStatus const&) = delete;
   DTHVStatus(const std::string& version);
 
   /** Destructor
@@ -132,9 +134,6 @@ class DTHVStatus {
   void initialize();
 
 private:
-  DTHVStatus(DTHVStatus const&) = delete;
-  DTHVStatus& operator=(DTHVStatus const&) = delete;
-
   std::string dataVersion;
 
   std::vector<std::pair<DTHVStatusId, DTHVStatusData> > dataList;
diff --git a/CondFormats/DTObjects/interface/DTLVStatus.h b/CondFormats/DTObjects/interface/DTLVStatus.h
index ec3a97031331c..5c1eab7b3a6dd 100644
--- a/CondFormats/DTObjects/interface/DTLVStatus.h
+++ b/CondFormats/DTObjects/interface/DTLVStatus.h
@@ -65,6 +65,8 @@ class DTLVStatus {
   /** Constructor
    */
   DTLVStatus();
+  DTLVStatus(DTLVStatus const&) = delete;
+  DTLVStatus& operator=(DTLVStatus const&) = delete;
   DTLVStatus(const std::string& version);
 
   /** Destructor
@@ -102,9 +104,6 @@ class DTLVStatus {
   void initialize();
 
 private:
-  DTLVStatus(DTLVStatus const&) = delete;
-  DTLVStatus& operator=(DTLVStatus const&) = delete;
-
   std::string dataVersion;
 
   std::vector<std::pair<DTLVStatusId, DTLVStatusData> > dataList;
diff --git a/CondFormats/DTObjects/interface/DTMtime.h b/CondFormats/DTObjects/interface/DTMtime.h
index 2ea57d60b5705..67f83132f997c 100644
--- a/CondFormats/DTObjects/interface/DTMtime.h
+++ b/CondFormats/DTObjects/interface/DTMtime.h
@@ -70,6 +70,8 @@ class DTMtime {
   /** Constructor
    */
   DTMtime();
+  DTMtime(DTMtime const&) = delete;
+  DTMtime& operator=(DTMtime const&) = delete;
   DTMtime(const std::string& version);
 
   /** Destructor
@@ -188,9 +190,6 @@ class DTMtime {
   void initialize();
 
 private:
-  DTMtime(DTMtime const&) = delete;
-  DTMtime& operator=(DTMtime const&) = delete;
-
   std::string dataVersion;
   float nsPerCount;
 
diff --git a/CondFormats/DTObjects/interface/DTPerformance.h b/CondFormats/DTObjects/interface/DTPerformance.h
index 48c2859ffc56f..4d335abddf720 100644
--- a/CondFormats/DTObjects/interface/DTPerformance.h
+++ b/CondFormats/DTObjects/interface/DTPerformance.h
@@ -70,6 +70,8 @@ class DTPerformance {
   /** Constructor
    */
   DTPerformance();
+  DTPerformance(DTPerformance const&) = delete;
+  DTPerformance& operator=(DTPerformance const&) = delete;
   DTPerformance(const std::string& version);
 
   /** Destructor
@@ -212,9 +214,6 @@ class DTPerformance {
   void initialize();
 
 private:
-  DTPerformance(DTPerformance const&) = delete;
-  DTPerformance& operator=(DTPerformance const&) = delete;
-
   std::string dataVersion;
   float nsPerCount;
 
diff --git a/CondFormats/DTObjects/interface/DTRangeT0.h b/CondFormats/DTObjects/interface/DTRangeT0.h
index c37a97fd6e25f..7be4e210fa4aa 100644
--- a/CondFormats/DTObjects/interface/DTRangeT0.h
+++ b/CondFormats/DTObjects/interface/DTRangeT0.h
@@ -65,6 +65,8 @@ class DTRangeT0 {
   /** Constructor
    */
   DTRangeT0();
+  DTRangeT0(DTRangeT0 const&) = delete;
+  DTRangeT0& operator=(DTRangeT0 const&) = delete;
   DTRangeT0(const std::string& version);
 
   /** Destructor
@@ -103,9 +105,6 @@ class DTRangeT0 {
   void initialize();
 
 private:
-  DTRangeT0(DTRangeT0 const&) = delete;
-  DTRangeT0& operator=(DTRangeT0 const&) = delete;
-
   std::string dataVersion;
 
   std::vector<std::pair<DTRangeT0Id, DTRangeT0Data> > dataList;
diff --git a/CondFormats/DTObjects/interface/DTReadOutMapping.h b/CondFormats/DTObjects/interface/DTReadOutMapping.h
index fe6a35b7d33df..6dde3e0e72390 100644
--- a/CondFormats/DTObjects/interface/DTReadOutMapping.h
+++ b/CondFormats/DTObjects/interface/DTReadOutMapping.h
@@ -64,6 +64,8 @@ class DTReadOutMapping {
   /** Constructor
    */
   DTReadOutMapping();
+  DTReadOutMapping(DTReadOutMapping const&) = delete;
+  DTReadOutMapping& operator=(DTReadOutMapping const&) = delete;
   DTReadOutMapping(const std::string& cell_map_version, const std::string& rob_map_version);
 
   /** Destructor
@@ -135,9 +137,6 @@ class DTReadOutMapping {
   const DTReadOutMapping* fullMap() const;
 
 private:
-  DTReadOutMapping(DTReadOutMapping const&) = delete;
-  DTReadOutMapping& operator=(DTReadOutMapping const&) = delete;
-
   edm::AtomicPtrCache<DTReadOutMappingCache> const& atomicCache() const { return atomicCache_; }
   edm::AtomicPtrCache<DTReadOutMappingCache>& atomicCache() { return atomicCache_; }
 
diff --git a/CondFormats/DTObjects/interface/DTStatusFlag.h b/CondFormats/DTObjects/interface/DTStatusFlag.h
index ec2670dab592a..5274028930f82 100644
--- a/CondFormats/DTObjects/interface/DTStatusFlag.h
+++ b/CondFormats/DTObjects/interface/DTStatusFlag.h
@@ -76,6 +76,8 @@ class DTStatusFlag {
   /** Constructor
    */
   DTStatusFlag();
+  DTStatusFlag(DTStatusFlag const&) = delete;
+  DTStatusFlag& operator=(DTStatusFlag const&) = delete;
   DTStatusFlag(const std::string& version);
 
   /** Destructor
@@ -196,9 +198,6 @@ class DTStatusFlag {
   void initialize();
 
 private:
-  DTStatusFlag(DTStatusFlag const&) = delete;
-  DTStatusFlag& operator=(DTStatusFlag const&) = delete;
-
   std::string dataVersion;
 
   std::vector<std::pair<DTStatusFlagId, DTStatusFlagData> > dataList;
diff --git a/CondFormats/DTObjects/interface/DTTPGParameters.h b/CondFormats/DTObjects/interface/DTTPGParameters.h
index 8a7dab869eee2..237ad3b1e8182 100644
--- a/CondFormats/DTObjects/interface/DTTPGParameters.h
+++ b/CondFormats/DTObjects/interface/DTTPGParameters.h
@@ -64,6 +64,7 @@ class DTTPGParameters {
   /** Constructor
    */
   DTTPGParameters();
+  DTTPGParameters(DTTPGParameters const&) = delete;
   DTTPGParameters(const std::string& version);
 
   /** Destructor
@@ -102,8 +103,6 @@ class DTTPGParameters {
   DTTPGParameters& operator=(DTTPGParameters const&);
 
 private:
-  DTTPGParameters(DTTPGParameters const&) = delete;
-
   std::string dataVersion;
   float nsPerCount;
   int clockLength;
diff --git a/CondFormats/DTObjects/interface/DTTtrig.h b/CondFormats/DTObjects/interface/DTTtrig.h
index 38d54d00e83e5..be41a3c0ba85b 100644
--- a/CondFormats/DTObjects/interface/DTTtrig.h
+++ b/CondFormats/DTObjects/interface/DTTtrig.h
@@ -70,6 +70,8 @@ class DTTtrig {
   /** Constructor
    */
   DTTtrig();
+  DTTtrig(DTTtrig const&) = delete;
+  DTTtrig& operator=(DTTtrig const&) = delete;
   DTTtrig(const std::string& version);
 
   /** Destructor
@@ -143,9 +145,6 @@ class DTTtrig {
   void initialize();
 
 private:
-  DTTtrig(DTTtrig const&) = delete;
-  DTTtrig& operator=(DTTtrig const&) = delete;
-
   std::string dataVersion;
   float nsPerCount;
 
diff --git a/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h b/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h
index 8fe175ee7b0fa..6e6cf7adbd6a0 100644
--- a/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h
+++ b/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h
@@ -39,6 +39,9 @@ class FactorizedJetCorrector {
   FactorizedJetCorrector();
   FactorizedJetCorrector(const std::string& fLevels, const std::string& fTags, const std::string& fOptions = "");
   FactorizedJetCorrector(const std::vector<JetCorrectorParameters>& fParameters);
+  FactorizedJetCorrector(const FactorizedJetCorrector&) = delete;
+  FactorizedJetCorrector& operator=(const FactorizedJetCorrector&) = delete;
+
 
   void setNPV(int fNPV);
   void setJetEta(float fEta);
@@ -60,8 +63,6 @@ class FactorizedJetCorrector {
 
 private:
   //---- Member Functions ----
-  FactorizedJetCorrector(const FactorizedJetCorrector&) = delete;
-  FactorizedJetCorrector& operator=(const FactorizedJetCorrector&) = delete;
   //---- Member Data ---------
   FactorizedJetCorrectorCalculator::VariableValues mValues;
   FactorizedJetCorrectorCalculator mCalc;
diff --git a/CondFormats/JetMETObjects/interface/FactorizedJetCorrectorCalculator.h b/CondFormats/JetMETObjects/interface/FactorizedJetCorrectorCalculator.h
index 0a88964085a44..ad454f7936490 100644
--- a/CondFormats/JetMETObjects/interface/FactorizedJetCorrectorCalculator.h
+++ b/CondFormats/JetMETObjects/interface/FactorizedJetCorrectorCalculator.h
@@ -95,14 +95,14 @@ class FactorizedJetCorrectorCalculator {
                                    const std::string& fTags,
                                    const std::string& fOptions = "");
   FactorizedJetCorrectorCalculator(const std::vector<JetCorrectorParameters>& fParameters);
+  FactorizedJetCorrectorCalculator(const FactorizedJetCorrectorCalculator&) = delete;
+  FactorizedJetCorrectorCalculator& operator=(const FactorizedJetCorrectorCalculator&) = delete;
   ~FactorizedJetCorrectorCalculator();
   float getCorrection(VariableValues&) const;
   std::vector<float> getSubCorrections(VariableValues&) const;
 
 private:
   //---- Member Functions ----
-  FactorizedJetCorrectorCalculator(const FactorizedJetCorrectorCalculator&) = delete;
-  FactorizedJetCorrectorCalculator& operator=(const FactorizedJetCorrectorCalculator&) = delete;
   float getLepPt(const VariableValues&) const;
   float getRelLepPt(const VariableValues&) const;
   float getPtRel(const VariableValues&) const;
diff --git a/CondFormats/JetMETObjects/interface/JetCorrectionUncertainty.h b/CondFormats/JetMETObjects/interface/JetCorrectionUncertainty.h
index fa22d8250818d..87d4b7bf9bf09 100644
--- a/CondFormats/JetMETObjects/interface/JetCorrectionUncertainty.h
+++ b/CondFormats/JetMETObjects/interface/JetCorrectionUncertainty.h
@@ -13,6 +13,8 @@ class JetCorrectionUncertainty {
   JetCorrectionUncertainty();
   JetCorrectionUncertainty(const std::string& fDataFile);
   JetCorrectionUncertainty(const JetCorrectorParameters& fParameters);
+  JetCorrectionUncertainty(const JetCorrectionUncertainty&) = delete;
+  JetCorrectionUncertainty& operator=(const JetCorrectionUncertainty&) = delete;
   ~JetCorrectionUncertainty();
 
   void setParameters(const std::string& fDataFile);
@@ -28,8 +30,6 @@ class JetCorrectionUncertainty {
   float getUncertainty(bool fDirection);
 
 private:
-  JetCorrectionUncertainty(const JetCorrectionUncertainty&) = delete;
-  JetCorrectionUncertainty& operator=(const JetCorrectionUncertainty&) = delete;
   std::vector<float> fillVector(const std::vector<std::string>& fNames);
   float getPtRel();
   //---- Member Data ---------
diff --git a/CondFormats/JetMETObjects/interface/SimpleJetCorrectionUncertainty.h b/CondFormats/JetMETObjects/interface/SimpleJetCorrectionUncertainty.h
index e47fd076611b3..c30d9783f95c6 100644
--- a/CondFormats/JetMETObjects/interface/SimpleJetCorrectionUncertainty.h
+++ b/CondFormats/JetMETObjects/interface/SimpleJetCorrectionUncertainty.h
@@ -12,13 +12,13 @@ class SimpleJetCorrectionUncertainty {
   SimpleJetCorrectionUncertainty();
   SimpleJetCorrectionUncertainty(const std::string& fDataFile);
   SimpleJetCorrectionUncertainty(const JetCorrectorParameters& fParameters);
+  SimpleJetCorrectionUncertainty(const SimpleJetCorrectionUncertainty&) = delete;
+  SimpleJetCorrectionUncertainty& operator=(const SimpleJetCorrectionUncertainty&) = delete;
   ~SimpleJetCorrectionUncertainty();
   const JetCorrectorParameters& parameters() const { return *mParameters; }
   float uncertainty(const std::vector<float>& fX, float fY, bool fDirection) const;
 
 private:
-  SimpleJetCorrectionUncertainty(const SimpleJetCorrectionUncertainty&) = delete;
-  SimpleJetCorrectionUncertainty& operator=(const SimpleJetCorrectionUncertainty&) = delete;
   int findBin(const std::vector<float>& v, float x) const;
   float uncertaintyBin(unsigned fBin, float fY, bool fDirection) const;
   float linearInterpolation(float fZ, const float fX[2], const float fY[2]) const;
diff --git a/CondTools/DT/interface/DTKeyedConfigCache.h b/CondTools/DT/interface/DTKeyedConfigCache.h
index 31b4484659c0b..623803bd4e99e 100644
--- a/CondTools/DT/interface/DTKeyedConfigCache.h
+++ b/CondTools/DT/interface/DTKeyedConfigCache.h
@@ -29,6 +29,8 @@ class DTKeyedConfig;
 class DTKeyedConfigCache {
 public:
   DTKeyedConfigCache();
+  DTKeyedConfigCache(const DTKeyedConfigCache& x) = delete;
+  const DTKeyedConfigCache& operator=(const DTKeyedConfigCache& x) = delete;
   virtual ~DTKeyedConfigCache();
 
   int get(const cond::persistency::KeyList& keyList, int cfgId, const DTKeyedConfig*& obj);
@@ -42,9 +44,6 @@ class DTKeyedConfigCache {
   static const int maxByteNumber;
 
 private:
-  DTKeyedConfigCache(const DTKeyedConfigCache& x) = delete;
-  const DTKeyedConfigCache& operator=(const DTKeyedConfigCache& x) = delete;
-
   typedef std::pair<int, const DTKeyedConfig*> counted_brick;
   std::map<int, counted_brick> brickMap;
   int cachedBrickNumber;
diff --git a/CondTools/Hcal/interface/StreamOutFormatTarget.h b/CondTools/Hcal/interface/StreamOutFormatTarget.h
index a9222697b4602..0640083ec29f4 100644
--- a/CondTools/Hcal/interface/StreamOutFormatTarget.h
+++ b/CondTools/Hcal/interface/StreamOutFormatTarget.h
@@ -32,6 +32,8 @@ class XMLPARSER_EXPORT StreamOutFormatTarget : public XMLFormatTarget {
   /** @name constructors and destructor */
   //@{
   StreamOutFormatTarget(std::ostream& fStream);
+  StreamOutFormatTarget(const StreamOutFormatTarget&) = delete;
+  StreamOutFormatTarget& operator=(const StreamOutFormatTarget&) = delete;
   ~StreamOutFormatTarget() override;
   //@}
 
@@ -47,8 +49,6 @@ class XMLPARSER_EXPORT StreamOutFormatTarget : public XMLFormatTarget {
   // -----------------------------------------------------------------------
   //  Unimplemented methods.
   // -----------------------------------------------------------------------
-  StreamOutFormatTarget(const StreamOutFormatTarget&) = delete;
-  StreamOutFormatTarget& operator=(const StreamOutFormatTarget&) = delete;
 };
 
 XERCES_CPP_NAMESPACE_END
diff --git a/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc b/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc
index 0509535aab061..fbd468ef78586 100644
--- a/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc
+++ b/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc
@@ -25,11 +25,11 @@ class BufferedBoostIODBWriter : public edm::EDAnalyzer {
   explicit BufferedBoostIODBWriter(const edm::ParameterSet&);
   ~BufferedBoostIODBWriter() override {}
 
-private:
   BufferedBoostIODBWriter() = delete;
   BufferedBoostIODBWriter(const BufferedBoostIODBWriter&) = delete;
   BufferedBoostIODBWriter& operator=(const BufferedBoostIODBWriter&) = delete;
 
+private:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
   std::string inputFile;
diff --git a/CondTools/L1Trigger/interface/OMDSReader.h b/CondTools/L1Trigger/interface/OMDSReader.h
index dee1653b52a9b..dad9000b63ec9 100644
--- a/CondTools/L1Trigger/interface/OMDSReader.h
+++ b/CondTools/L1Trigger/interface/OMDSReader.h
@@ -82,6 +82,10 @@ namespace l1t {
 
     OMDSReader(const std::string& connectString, const std::string& authenticationPath);
 
+    OMDSReader(const OMDSReader&) = delete;  // stop default
+
+    const OMDSReader& operator=(const OMDSReader&) = delete;  // stop default
+
     ~OMDSReader() override;
 
     // ---------- const member functions ---------------------
@@ -183,10 +187,6 @@ namespace l1t {
     void connect(const std::string& connectString, const std::string& authenticationPath);
 
   private:
-    OMDSReader(const OMDSReader&) = delete;  // stop default
-
-    const OMDSReader& operator=(const OMDSReader&) = delete;  // stop default
-
     // ---------- member data --------------------------------
   };
 

From 49bc9c0dfcc439e5c9f4ee1d0a75fcd40ea48128 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Thu, 29 Jul 2021 10:11:00 +0200
Subject: [PATCH 2/2] code-format

---
 CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h b/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h
index 6e6cf7adbd6a0..58e446f017387 100644
--- a/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h
+++ b/CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h
@@ -42,7 +42,6 @@ class FactorizedJetCorrector {
   FactorizedJetCorrector(const FactorizedJetCorrector&) = delete;
   FactorizedJetCorrector& operator=(const FactorizedJetCorrector&) = delete;
 
-
   void setNPV(int fNPV);
   void setJetEta(float fEta);
   void setJetPt(float fPt);