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.

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

[Alignment][clang-tidy] make deleted function public #34671

Merged
merged 1 commit into from Jul 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Alignment/CommonAlignment/interface/AlignableComposite.h
Expand Up @@ -97,6 +97,10 @@ class AlignableComposite : public Alignable {
/// Return surface deformations
int surfaceDeformationIdPairs(std::vector<std::pair<int, SurfaceDeformation*> >&) const override;

// avoid implicit cast of not explicitely defined version to the defined ones
template <class T>
void update(T) = delete;

protected:
/// Constructor from GeomDet, only for use in AlignableDet
explicit AlignableComposite(const GeomDet* geomDet);
Expand All @@ -105,10 +109,6 @@ class AlignableComposite : public Alignable {
/// The given GeomDetUnit id has to match the current id.
void update(const GeomDet* geomDet);

// avoid implicit cast of not explicitely defined version to the defined ones
template <class T>
void update(T) = delete;

void setSurface(const AlignableSurface& s) { theSurface = s; }

StructureType theStructureType;
Expand Down
Expand Up @@ -116,10 +116,11 @@ class AlignmentMonitorBase {

const edm::InputTag m_beamSpotTag;

private:
public:
AlignmentMonitorBase(const AlignmentMonitorBase &) = delete; // stop default
const AlignmentMonitorBase &operator=(const AlignmentMonitorBase &) = delete; // stop default

private:
// ---------- member data --------------------------------

int m_iteration;
Expand Down
2 changes: 0 additions & 2 deletions Alignment/Geners/interface/AbsReader.hh
Expand Up @@ -73,7 +73,6 @@ namespace gs {
return it->second->read(id, in);
}

private:
DefaultReader(const DefaultReader &) = delete;
DefaultReader &operator=(const DefaultReader &) = delete;
};
Expand Down Expand Up @@ -106,7 +105,6 @@ namespace gs {
rd[id.name()] = new ConcreteReader<InheritanceBase, Derived>();
}

private:
// Disable the constructor
StaticReader() = delete;
};
Expand Down
3 changes: 1 addition & 2 deletions Alignment/Geners/interface/AbsReference.hh
Expand Up @@ -14,6 +14,7 @@ namespace gs {

class AbsReference {
public:
AbsReference() = delete;
inline virtual ~AbsReference() {}

inline AbsArchive &archive() const { return archive_; }
Expand Down Expand Up @@ -64,8 +65,6 @@ namespace gs {
private:
friend class AbsArchive;

AbsReference() = delete;

void initialize() const;
void addItemId(unsigned long long id);

Expand Down
2 changes: 1 addition & 1 deletion Alignment/Geners/interface/ArrayAdaptor.hh
Expand Up @@ -41,9 +41,9 @@ namespace gs {
return (const_cast<T *>(data_))[index];
}

private:
ArrayAdaptor() = delete;

private:
const T *data_;
std::size_t size_;
bool writetemCl_;
Expand Down
4 changes: 2 additions & 2 deletions Alignment/Geners/interface/BZ2Handle.hh
Expand Up @@ -17,11 +17,11 @@ namespace gs {
explicit BZ2InflateHandle(bz_stream &strm);
~BZ2InflateHandle();

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

private:
bz_stream *strm_;
};

Expand All @@ -30,11 +30,11 @@ namespace gs {
explicit BZ2DeflateHandle(bz_stream &strm);
~BZ2DeflateHandle();

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

private:
bz_stream *strm_;
};
} // namespace gs
Expand Down
3 changes: 2 additions & 1 deletion Alignment/Geners/interface/BinaryArchiveBase.hh
Expand Up @@ -165,11 +165,12 @@ namespace gs {
const ClassId *catalogEntryClassId() const { return storedEntryId_; }
const ClassId *itemLocationClassId() const { return storedLocationId_; }

private:
public:
BinaryArchiveBase() = delete;
BinaryArchiveBase(const BinaryArchiveBase &) = delete;
BinaryArchiveBase &operator=(const BinaryArchiveBase &) = delete;

private:
static bool parseArchiveOptions(std::ostringstream &errmes,
const char *mode,
CStringStream::CompressionMode *m,
Expand Down
1 change: 0 additions & 1 deletion Alignment/Geners/interface/CStringBuf.hh
Expand Up @@ -11,7 +11,6 @@ namespace gs {
const char *getGetBuffer(unsigned long long *len) const;
const char *getPutBuffer(unsigned long long *len) const;

private:
CStringBuf(const CStringBuf &) = delete;
CStringBuf &operator=(const CStringBuf &) = delete;
};
Expand Down
2 changes: 1 addition & 1 deletion Alignment/Geners/interface/CStringStream.hh
Expand Up @@ -65,10 +65,10 @@ namespace gs {
// String representation of the compression mode
static std::string compressionModeName(CompressionMode m, bool useShortName = true);

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

private:
CStringBuf buf_;
CompressionMode mode_;
int compressionLevel_;
Expand Down
2 changes: 1 addition & 1 deletion Alignment/Geners/interface/ItemLocation.hh
Expand Up @@ -31,9 +31,9 @@ namespace gs {
static inline unsigned version() { return 1; }
static ItemLocation *read(const ClassId &id, std::istream &in);

private:
ItemLocation() = delete;

private:
std::streampos pos_;
std::string URI_;
std::string cachedItemURI_;
Expand Down
3 changes: 2 additions & 1 deletion Alignment/Geners/interface/Reference.hh
Expand Up @@ -35,8 +35,9 @@ namespace gs {
CPP11_auto_ptr<T> get(unsigned long index) const;
std::shared_ptr<T> getShared(unsigned long index) const;

private:
Reference() = delete;

private:
T *getPtr(unsigned long index) const;
};
} // namespace gs
Expand Down
2 changes: 1 addition & 1 deletion Alignment/Geners/interface/SearchSpecifier.hh
Expand Up @@ -32,9 +32,9 @@ namespace gs {

bool matches(const std::string &sentence) const;

private:
SearchSpecifier() = delete;

private:
std::string tag_;
Regex regex_;
bool useRegex_;
Expand Down
6 changes: 3 additions & 3 deletions Alignment/Geners/interface/WriteOnlyCatalog.hh
Expand Up @@ -11,6 +11,9 @@ namespace gs {
public:
// The output stream should be dedicated exclusively to this catalog
WriteOnlyCatalog(std::ostream &os, unsigned long long firstId = 1);
WriteOnlyCatalog(const WriteOnlyCatalog &) = delete;
WriteOnlyCatalog &operator=(const WriteOnlyCatalog &) = delete;

inline ~WriteOnlyCatalog() override {}

inline unsigned long long size() const override { return count_; }
Expand Down Expand Up @@ -56,9 +59,6 @@ namespace gs {
inline bool isEqual(const AbsCatalog &) const override { return false; }

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

std::ostream &os_;
unsigned long long count_;
unsigned long long smallestId_;
Expand Down
4 changes: 2 additions & 2 deletions Alignment/Geners/interface/ZlibHandle.hh
Expand Up @@ -13,10 +13,10 @@ namespace gs {

inline z_stream_s &strm() { return *strm_; }

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

private:
z_stream_s *strm_;
};

Expand All @@ -28,11 +28,11 @@ namespace gs {
inline z_stream_s &strm() { return *strm_; }
inline int level() { return level_; }

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

private:
z_stream_s *strm_;
int level_;
};
Expand Down
3 changes: 2 additions & 1 deletion Alignment/Geners/src/AbsArchive.cc
Expand Up @@ -36,8 +36,9 @@ namespace {
inline NotWritableRecord(const gs::ClassId &classId, const char *ioPrototype, const char *name, const char *category)
: gs::AbsRecord(classId, ioPrototype, name, category) {}

private:
NotWritableRecord() = delete;

private:
inline bool writeData(std::ostream &) const override { return false; }
};
} // namespace
Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/interface/MuonAlignmentInputDB.h
Expand Up @@ -41,11 +41,11 @@ class MuonAlignmentInputDB : public MuonAlignmentInputMethod {

AlignableMuon *newAlignableMuon(const edm::EventSetup &iSetup) const override;

private:
MuonAlignmentInputDB(const MuonAlignmentInputDB &) = delete; // stop default

const MuonAlignmentInputDB &operator=(const MuonAlignmentInputDB &) = delete; // stop default

private:
// ---------- member data --------------------------------

std::string m_dtLabel, m_cscLabel, m_gemLabel, idealGeometryLabel;
Expand Down
Expand Up @@ -45,11 +45,11 @@ class MuonAlignmentInputMethod {

virtual AlignableMuon *newAlignableMuon(const edm::EventSetup &iSetup) const;

private:
MuonAlignmentInputMethod(const MuonAlignmentInputMethod &) = delete; // stop default

const MuonAlignmentInputMethod &operator=(const MuonAlignmentInputMethod &) = delete; // stop default

private:
// ---------- member data --------------------------------
std::string idealGeometryLabel;
};
Expand Down
Expand Up @@ -42,11 +42,11 @@ class MuonAlignmentInputSurveyDB : public MuonAlignmentInputMethod {

AlignableMuon* newAlignableMuon(const edm::EventSetup& iSetup) const override;

private:
MuonAlignmentInputSurveyDB(const MuonAlignmentInputSurveyDB&) = delete; // stop default

const MuonAlignmentInputSurveyDB& operator=(const MuonAlignmentInputSurveyDB&) = delete; // stop default

private:
void addSurveyInfo_(Alignable* ali,
unsigned int* theSurveyIndex,
const Alignments* theSurveyValues,
Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/interface/MuonAlignmentInputXML.h
Expand Up @@ -43,11 +43,11 @@ class MuonAlignmentInputXML : public MuonAlignmentInputMethod {

AlignableMuon *newAlignableMuon(const edm::EventSetup &iSetup) const override;

private:
MuonAlignmentInputXML(const MuonAlignmentInputXML &) = delete; // stop default

const MuonAlignmentInputXML &operator=(const MuonAlignmentInputXML &) = delete; // stop default

private:
void recursiveGetId(std::map<unsigned int, Alignable *> &alignableNavigator,
const align::Alignables &alignables) const;

Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/interface/MuonAlignmentOutputXML.h
Expand Up @@ -45,11 +45,11 @@ class MuonAlignmentOutputXML {

void write(AlignableMuon *alignableMuon, const edm::EventSetup &iSetup) const;

private:
MuonAlignmentOutputXML(const MuonAlignmentOutputXML &) = delete; // stop default

const MuonAlignmentOutputXML &operator=(const MuonAlignmentOutputXML &) = delete; // stop default

private:
void writeComponents(align::Alignables &alignables,
align::Alignables &ideals,
std::map<align::ID, CLHEP::HepSymMatrix> &errors,
Expand Down