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

EventFilter-EcalRawToDigi: fix clang warning hides overloaded virtual function #17080

Merged
merged 1 commit into from Dec 20, 2016
Merged

EventFilter-EcalRawToDigi: fix clang warning hides overloaded virtual function #17080

merged 1 commit into from Dec 20, 2016

Conversation

gartung
Copy link
Member

@gartung gartung commented Dec 19, 2016

by adding using directive and adding parameters to function calls to disambiguate from base class function call. If the function is called without the defaulted parameter it could be interpreted as a call to the base class function.

… function

by adding using directive and adding parameters to function calls to
disambiguate from base class function call.
@cmsbuild cmsbuild added this to the Next CMSSW_9_0_X milestone Dec 19, 2016
@gartung
Copy link
Member Author

gartung commented Dec 19, 2016

@Dr15Jones please review

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @gartung (Patrick Gartung) for CMSSW_9_0_X.

It involves the following packages:

EventFilter/EcalRawToDigi

@cmsbuild, @cvuosalo, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @argiro this is something you requested to watch as well.
@slava77, @smuzaffar you are the release manager for this.

cms-bot commands are listed here #13028

@@ -164,7 +164,7 @@ void DCCEBEventBlock::unpack(const uint64_t * buffer, size_t numbBytes, unsigned

// Unpack SRP block
if(srChStatus_ != CH_TIMEOUT && srChStatus_ != CH_DISABLED){
STATUS = srpBlock_->unpack(&data_,&dwToEnd_);
STATUS = srpBlock_->unpack(&data_,&dwToEnd_,SRP_NUMBFLAGS);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was adding the default value needed? Did it fail to compile otherwise?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. With the using statement in the header clang now see two signatures of unpack that take two parameters: one is the base class function and the other is the derived class function with one of three parameters defaulted.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to do something similar for #17015

@cvuosalo
Copy link
Contributor

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 19, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/17122/console Started: 2016/12/19 20:58

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

@cvuosalo
Copy link
Contributor

+1

For #17080 8728cb8

Fixing Clang warnings about overloaded functions in EcalRawToDigi. There should be no change in monitored quantities.

The code changes are satisfactory, and Jenkins tests against baseline CMSSW_9_0_X_2016-12-19-1100 show no significant differences, as expected.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_9_0_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @smuzaffar

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit b66f95c into cms-sw:CMSSW_9_0_X Dec 20, 2016
@gartung gartung deleted the EventFilter-EcalRawToDigi-fix-clang-warning branch December 21, 2016 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants