Merge pull request #17017 from gartung/PhysicsTools-IsolationUtils-fi…

…x-clang-warnings PhysicsTools/IsolationUtils: fix clang warning hides overloaded virtual function
cms-sw · Dec 21, 2016 · 9218304 · 9218304
2 parents bdfca12 + d885471
commit 9218304
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h b/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
@@ -44,15 +44,15 @@ class ConeAreaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IParametri
 
   void SetAcceptanceLimit(double etaMax);
 
-  virtual ROOT::Math::IGenFunction* Clone () const { return new ConeAreaFunction(*this); }
+  virtual ROOT::Math::IGenFunction* Clone () const override { return new ConeAreaFunction(*this); }
 
  protected:
-  void SetParameters(double* param);
-  virtual double DoEvalPar(double , const double *) const;
-  double DoEval(double x) const;
+  void SetParameters(double const* param) override;
+  virtual double DoEvalPar(double , const double *) const override;
+  double DoEval(double x) const override;
   double DoDerivative(double x) const;
   void DoParameterGradient(double x, double* paramGradient) const;
-  virtual double DoParameterDerivative(double, const double*, unsigned int) const;
+  virtual double DoParameterDerivative(double, const double*, unsigned int) const override;
 
 // !!! ONLY FOR TESTING
 mutable double theta0_; // polar angle of cone axis

diff --git a/PhysicsTools/IsolationUtils/interface/ConeAreaRootFunction.h b/PhysicsTools/IsolationUtils/interface/ConeAreaRootFunction.h
@@ -37,12 +37,12 @@ class ConeAreaRootFunction : public ConeAreaFunction
 
   void SetParameterConeArea(double coneArea);
 
-  ROOT::Math::IGenFunction* Clone () const { return new ConeAreaRootFunction(*this); }
+  ROOT::Math::IGenFunction* Clone () const override { return new ConeAreaRootFunction(*this); }
 
  private:
-  void SetParameters(double* param);
+  void SetParameters(const double* param) override;
 
-  double DoEval(double x) const;
+  double DoEval(double x) const override;
 
   double coneArea_; // area covered by cone
 

diff --git a/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h b/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
@@ -37,15 +37,15 @@ class IntegralOverPhiFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPa
   void SetParameterPhi0(double phi0);
   void SetParameterAlpha(double alpha);
 
-  virtual ROOT::Math::IGenFunction* Clone () const { return new IntegralOverPhiFunction(*this); }
+  virtual ROOT::Math::IGenFunction* Clone () const override { return new IntegralOverPhiFunction(*this); }
 
  private:
-  void SetParameters(double* param);
+  void SetParameters(double const * param) override;
 
-  double DoEval(double x) const;
-  virtual double DoEvalPar(double x, const double* param) const;
+  double DoEval(double x) const override;
+  virtual double DoEvalPar(double x, const double* param) const override;
   double DoDerivative(double x) const;
-  virtual double DoParameterDerivative(double, const double*, unsigned int) const;
+  virtual double DoParameterDerivative(double, const double*, unsigned int) const override;
   void DoParameterGradient(double x, double* paramGradient) const;
 
   mutable double theta0_; // polar angle of cone axis

diff --git a/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h b/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
@@ -43,15 +43,15 @@ class IntegrandThetaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPar
   void SetParameterPhi0(double phi0);
   void SetParameterAlpha(double alpha);
 
-  virtual ROOT::Math::IGenFunction* Clone () const { return new IntegrandThetaFunction(*this); }
+  virtual ROOT::Math::IGenFunction* Clone () const override { return new IntegrandThetaFunction(*this); }
 
  private:
-  void SetParameters(double* param);
+  void SetParameters(double const * param) override;
 
-  double DoEval(double x) const;
-  virtual double DoEvalPar(double, const double*) const;
+  double DoEval(double x) const override;
+  virtual double DoEvalPar(double, const double*) const override;
   double DoDerivative(double x) const;
-  virtual double DoParameterDerivative(double, const double*, unsigned int) const;
+  virtual double DoParameterDerivative(double, const double*, unsigned int) const override;
   void DoParameterGradient(double x, double* paramGradient) const;
 
   mutable double theta0_; // polar angle of cone axis

diff --git a/PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc b/PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc
@@ -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

diff --git a/PhysicsTools/IsolationUtils/src/ConeAreaRootFunction.cc b/PhysicsTools/IsolationUtils/src/ConeAreaRootFunction.cc
@@ -73,7 +73,7 @@ void ConeAreaRootFunction::SetParameterConeArea(double coneArea)
   coneArea_ = coneArea;
 }
 
-void ConeAreaRootFunction::SetParameters(double* param)
+void ConeAreaRootFunction::SetParameters(const double* param)
 {
   if ( debugLevel_ > 0 ) {
     edm::LogVerbatim("") << "<ConeAreaRootFunction::SetParameters>:" << std::endl

diff --git a/PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc b/PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc
@@ -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];

diff --git a/PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc b/PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc
@@ -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];