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

[GCC 8.1] Fixed const correctness for operator() #23224

Merged
merged 1 commit into from May 22, 2018
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
16 changes: 8 additions & 8 deletions CondFormats/HcalObjects/interface/HcalDcsMap.h
Expand Up @@ -130,31 +130,31 @@ class HcalDcsMap {
namespace HcalDcsMapAddons {
class LessById {
public:
bool operator () (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) {
bool operator () (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) const {
return a->mId < b->mId;
}
bool operator () (const HcalDcsMap::Item& a, const HcalDcsMap::Item& b) {
bool operator () (const HcalDcsMap::Item& a, const HcalDcsMap::Item& b) const {
return a.mId < b.mId;
}
bool equal (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) {
bool equal (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) const {
return a->mId == b->mId;
}
bool good (const HcalDcsMap::Item& a) {
bool good (const HcalDcsMap::Item& a) const {
return a.mDcsId;
}
};
class LessByDcsId {
public:
bool operator () (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) {
bool operator () (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) const {
return a->mDcsId < b->mDcsId;
}
bool operator () (const HcalDcsMap::Item& a, const HcalDcsMap::Item& b) {
bool operator () (const HcalDcsMap::Item& a, const HcalDcsMap::Item& b) const {
return a.mDcsId < b.mDcsId;
}
bool equal (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) {
bool equal (const HcalDcsMap::Item* a, const HcalDcsMap::Item* b) const {
return a->mDcsId == b->mDcsId;
}
bool good (const HcalDcsMap::Item& a) {
bool good (const HcalDcsMap::Item& a) const {
return a.mDcsId;
}
};
Expand Down
8 changes: 4 additions & 4 deletions CondFormats/HcalObjects/interface/HcalFrontEndMap.h
Expand Up @@ -82,10 +82,10 @@ class HcalFrontEndMap {
namespace HcalFrontEndMapAddons {
class LessById {
public:
bool operator () (const HcalFrontEndMap::PrecisionItem* a, const HcalFrontEndMap::PrecisionItem* b) {return a->mId < b->mId;}
bool operator () (const HcalFrontEndMap::PrecisionItem& a, const HcalFrontEndMap::PrecisionItem& b) {return a.mId < b.mId;}
bool equal (const HcalFrontEndMap::PrecisionItem* a, const HcalFrontEndMap::PrecisionItem* b) {return a->mId == b->mId;}
bool good (const HcalFrontEndMap::PrecisionItem& a) {return a.mId;}
bool operator () (const HcalFrontEndMap::PrecisionItem* a, const HcalFrontEndMap::PrecisionItem* b) const {return a->mId < b->mId;}
bool operator () (const HcalFrontEndMap::PrecisionItem& a, const HcalFrontEndMap::PrecisionItem& b) const {return a.mId < b.mId;}
bool equal (const HcalFrontEndMap::PrecisionItem* a, const HcalFrontEndMap::PrecisionItem* b) const {return a->mId == b->mId;}
bool good (const HcalFrontEndMap::PrecisionItem& a) const {return a.mId;}
};
class Helper {
public:
Expand Down
8 changes: 4 additions & 4 deletions CondFormats/HcalObjects/interface/HcalSiPMCharacteristics.h
Expand Up @@ -87,10 +87,10 @@ class HcalSiPMCharacteristics {
namespace HcalSiPMCharacteristicsAddons {
class LessByType {
public:
bool operator () (const HcalSiPMCharacteristics::PrecisionItem* a, const HcalSiPMCharacteristics::PrecisionItem* b) {return a->type_ < b->type_;}
bool operator () (const HcalSiPMCharacteristics::PrecisionItem& a, const HcalSiPMCharacteristics::PrecisionItem& b) {return a.type_ < b.type_;}
bool equal (const HcalSiPMCharacteristics::PrecisionItem* a, const HcalSiPMCharacteristics::PrecisionItem* b) {return a->type_ == b->type_;}
bool good (const HcalSiPMCharacteristics::PrecisionItem& a) {return a.type_;}
bool operator () (const HcalSiPMCharacteristics::PrecisionItem* a, const HcalSiPMCharacteristics::PrecisionItem* b) const {return a->type_ < b->type_;}
bool operator () (const HcalSiPMCharacteristics::PrecisionItem& a, const HcalSiPMCharacteristics::PrecisionItem& b) const {return a.type_ < b.type_;}
bool equal (const HcalSiPMCharacteristics::PrecisionItem* a, const HcalSiPMCharacteristics::PrecisionItem* b) const {return a->type_ == b->type_;}
bool good (const HcalSiPMCharacteristics::PrecisionItem& a) const {return a.type_;}
};
class Helper {
public:
Expand Down