Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Cond][clang-tidy] make deleted function public #34682

Merged
merged 2 commits into from
Aug 3, 2021
Merged

[Cond][clang-tidy] make deleted function public #34682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6ae9d9
[Cond][clang-tidy] make deleted function public
smuzaffar Jul 29, 2021
49bc9c0
code-format
smuzaffar Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions CondCore/CondDB/plugins/XMLAuthenticationService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
};

/**
Expand Down
5 changes: 2 additions & 3 deletions CondCore/ESSources/interface/DataProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------

Expand All @@ -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 --------------------------------
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTBufferTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTCCBConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTDeadFlag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ class DTDeadFlag {
/** Constructor
*/
DTDeadFlag();
DTDeadFlag(DTDeadFlag const&) = delete;
DTDeadFlag& operator=(DTDeadFlag const&) = delete;
DTDeadFlag(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTHVStatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ class DTHVStatus {
/** Constructor
*/
DTHVStatus();
DTHVStatus(DTHVStatus const&) = delete;
DTHVStatus& operator=(DTHVStatus const&) = delete;
DTHVStatus(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTLVStatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ class DTLVStatus {
/** Constructor
*/
DTLVStatus();
DTLVStatus(DTLVStatus const&) = delete;
DTLVStatus& operator=(DTLVStatus const&) = delete;
DTLVStatus(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTMtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ class DTMtime {
/** Constructor
*/
DTMtime();
DTMtime(DTMtime const&) = delete;
DTMtime& operator=(DTMtime const&) = delete;
DTMtime(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -188,9 +190,6 @@ class DTMtime {
void initialize();

private:
DTMtime(DTMtime const&) = delete;
DTMtime& operator=(DTMtime const&) = delete;

std::string dataVersion;
float nsPerCount;

Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTPerformance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ class DTPerformance {
/** Constructor
*/
DTPerformance();
DTPerformance(DTPerformance const&) = delete;
DTPerformance& operator=(DTPerformance const&) = delete;
DTPerformance(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -212,9 +214,6 @@ class DTPerformance {
void initialize();

private:
DTPerformance(DTPerformance const&) = delete;
DTPerformance& operator=(DTPerformance const&) = delete;

std::string dataVersion;
float nsPerCount;

Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTRangeT0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ class DTRangeT0 {
/** Constructor
*/
DTRangeT0();
DTRangeT0(DTRangeT0 const&) = delete;
DTRangeT0& operator=(DTRangeT0 const&) = delete;
DTRangeT0(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTReadOutMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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_; }

Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTStatusFlag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ class DTStatusFlag {
/** Constructor
*/
DTStatusFlag();
DTStatusFlag(DTStatusFlag const&) = delete;
DTStatusFlag& operator=(DTStatusFlag const&) = delete;
DTStatusFlag(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions CondFormats/DTObjects/interface/DTTPGParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class DTTPGParameters {
/** Constructor
*/
DTTPGParameters();
DTTPGParameters(DTTPGParameters const&) = delete;
DTTPGParameters(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -102,8 +103,6 @@ class DTTPGParameters {
DTTPGParameters& operator=(DTTPGParameters const&);

private:
DTTPGParameters(DTTPGParameters const&) = delete;

std::string dataVersion;
float nsPerCount;
int clockLength;
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/DTObjects/interface/DTTtrig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ class DTTtrig {
/** Constructor
*/
DTTtrig();
DTTtrig(DTTtrig const&) = delete;
DTTtrig& operator=(DTTtrig const&) = delete;
DTTtrig(const std::string& version);

/** Destructor
Expand Down Expand Up @@ -143,9 +145,6 @@ class DTTtrig {
void initialize();

private:
DTTtrig(DTTtrig const&) = delete;
DTTtrig& operator=(DTTtrig const&) = delete;

std::string dataVersion;
float nsPerCount;

Expand Down
4 changes: 2 additions & 2 deletions CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ 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);
Expand All @@ -60,8 +62,6 @@ class FactorizedJetCorrector {

private:
//---- Member Functions ----
FactorizedJetCorrector(const FactorizedJetCorrector&) = delete;
FactorizedJetCorrector& operator=(const FactorizedJetCorrector&) = delete;
//---- Member Data ---------
FactorizedJetCorrectorCalculator::VariableValues mValues;
FactorizedJetCorrectorCalculator mCalc;
Expand Down
4 changes: 2 additions & 2 deletions CondFormats/JetMETObjects/interface/FactorizedJetCorrectorCalculator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions CondFormats/JetMETObjects/interface/JetCorrectionUncertainty.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 ---------
Expand Down
4 changes: 2 additions & 2 deletions CondFormats/JetMETObjects/interface/SimpleJetCorrectionUncertainty.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondTools/DT/interface/DTKeyedConfigCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/StreamOutFormatTarget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
//@}

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading