Skip to content

Commit

Permalink
Merge pull request #23246 from smuzaffar/gcc8-fix-const-reconstruction
Browse files Browse the repository at this point in the history
[GCC 8] [RECO] Fixed const correctness for operator()
  • Loading branch information
cmsbuild committed May 21, 2018
2 parents 791e6ba + 0c6e440 commit 147c203
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DataFormats/MuonData/interface/MuonDigiCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ template <typename IndexType, typename DigiType>
DigiContainerIterator &operator++ (void)
{ ++base_; return *this; }

bool operator== (const DigiContainerIterator &x)
bool operator== (const DigiContainerIterator &x) const
{ return x.base_ == base_; }

bool operator!= (const DigiContainerIterator &x)
bool operator!= (const DigiContainerIterator &x) const
{ return x.base_ != base_; }

value_type operator* (void) const
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/EcalTBRawToDigi/src/DCCDataMapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public :
/**
Overloads operator() returning true if DCCDataField 1 comes first then DCCDataField 2 in the DCC data block
*/
bool operator()(DCCTBDataField *d1, DCCTBDataField * d2){
bool operator()(DCCTBDataField *d1, DCCTBDataField * d2) const{
bool value(false);

if (d1->wordPosition() < d2->wordPosition()){
Expand Down
2 changes: 1 addition & 1 deletion RecoMET/METAlgorithms/interface/HcalNoiseAlgo.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class JoinCaloTowerRefVectorsWithoutDuplicates

// helper function to compare calotower references
struct twrrefcomp {
inline bool operator() ( const edm::Ref<CaloTowerCollection> & t1, const edm::Ref<CaloTowerCollection> & t2 ) {
inline bool operator() ( const edm::Ref<CaloTowerCollection> & t1, const edm::Ref<CaloTowerCollection> & t2 ) const{
return t1->id() < t2->id();
}
};
Expand Down

0 comments on commit 147c203

Please sign in to comment.