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

PhysicsTools/IsolationUtils: fix clang warning hides overloaded virtual function #17017

Merged
merged 5 commits into from Dec 21, 2016
Merged

PhysicsTools/IsolationUtils: fix clang warning hides overloaded virtual function #17017

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e19bd66
PhysicsTools/IsolationUtils: fix clang warning hides overloaded virtu…
gartung Dec 14, 2016
4785921
Merge branch 'CMSSW_9_0_X' into PhysicsTools-IsolationUtils-fix-clang…
gartung Dec 14, 2016
748ffd6
Merge branch 'CMSSW_9_0_X' of https://github.com/cms-sw/cmssw into Ph…
gartung Dec 14, 2016
6cbc41a
Merge branch 'CMSSW_9_0_X' into PhysicsTools-IsolationUtils-fix-clang…
gartung Dec 16, 2016
d885471
add override keyword where needed
gartung Dec 19, 2016
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
2 changes: 1 addition & 1 deletion PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ class ConeAreaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IParametri
virtual ROOT::Math::IGenFunction* Clone () const { return new ConeAreaFunction(*this); }

protected:
void SetParameters(double* param);
void SetParameters(double const* param);
Copy link
Contributor

Choose a reason for hiding this comment

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

how about adding override? Same the for rest.

virtual double DoEvalPar(double , const double *) const;
double DoEval(double x) const;
double DoDerivative(double x) const;
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ class IntegralOverPhiFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPa
virtual ROOT::Math::IGenFunction* Clone () const { return new IntegralOverPhiFunction(*this); }

private:
void SetParameters(double* param);
void SetParameters(double const * param);

double DoEval(double x) const;
virtual double DoEvalPar(double x, const double* param) const;
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ class IntegrandThetaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPar
virtual ROOT::Math::IGenFunction* Clone () const { return new IntegrandThetaFunction(*this); }

private:
void SetParameters(double* param);
void SetParameters(double const * param);

double DoEval(double x) const;
virtual double DoEvalPar(double, const double*) const;
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ void ConeAreaFunction::SetParameterPhi0(double phi0)
phi0_ = normalizedPhi(phi0); // map azimuth angle into interval [-pi,+pi]
}

void ConeAreaFunction::SetParameters(double* param)
void ConeAreaFunction::SetParameters(const double* param)
{
if ( debugLevel_ > 0 ) {
edm::LogVerbatim("") << "<ConeAreaFunction::SetParameters>:" << std::endl
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ void IntegralOverPhiFunction::SetParameterAlpha(double alpha)
alpha_ = alpha;
}

void IntegralOverPhiFunction::SetParameters(double* param)
void IntegralOverPhiFunction::SetParameters(const double* param)
{
theta0_ = param[0];
phi0_ = param[1];
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@ void IntegrandThetaFunction::SetParameterAlpha(double alpha)
alpha_ = alpha;
}

void IntegrandThetaFunction::SetParameters(double* param)
void IntegrandThetaFunction::SetParameters(const double* param)
{
theta0_ = param[0];
phi0_ = param[1];
Expand Down