* Remove warnings of hidden overloaded virtual function

* Remove warnings of overridden virtual function
cms-sw · May 9, 2016 · f30cd7e · f30cd7e
1 parent fe2716d
commit f30cd7e
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 16 deletions.
diff --git a/Geometry/CommonTopologies/interface/RectangularStripTopology.h b/Geometry/CommonTopologies/interface/RectangularStripTopology.h
@@ -13,10 +13,12 @@ class RectangularStripTopology final : public StripTopology {
 
   RectangularStripTopology(int nstrips, float pitch, float detlength);
 
+  using StripTopology::localPosition;
   virtual LocalPoint localPosition(float strip) const;
 
   virtual LocalPoint localPosition(const MeasurementPoint&) const;
-
+
+  using StripTopology::localError; 
   virtual LocalError 
   localError(float strip, float stripErr2) const;
 

diff --git a/Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h b/Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h
@@ -40,8 +40,8 @@ class EcalPreshowerGeometry final : public CaloSubdetectorGeometry
 
       static std::string dbString() { return "PEcalPreshowerRcd" ; }
 
-      virtual unsigned int numberOfShapes() const { return k_NumberOfShapes ; }
-      virtual unsigned int numberOfParametersPerShape() const { return k_NumberOfParametersPerShape ; }
+      virtual unsigned int numberOfShapes() const override { return k_NumberOfShapes ; }
+      virtual unsigned int numberOfParametersPerShape() const override { return k_NumberOfParametersPerShape ; }
 
       EcalPreshowerGeometry() ;
 
@@ -54,16 +54,16 @@ class EcalPreshowerGeometry final : public CaloSubdetectorGeometry
 		       CCGFloat z2plus ) ;
 
       // Get closest cell
-      virtual DetId getClosestCell( const GlobalPoint& r ) const ;
+      virtual DetId getClosestCell( const GlobalPoint& r ) const override;
 
 
       // Get closest cell in arbitrary plane (1 or 2)
       virtual DetId getClosestCellInPlane( const GlobalPoint& r     ,
 					   int                plane   ) const ;
 
 
-      virtual void initializeParms() ;
-      virtual unsigned int numberOfTransformParms() const { return 3 ; }
+      virtual void initializeParms() override;
+      virtual unsigned int numberOfTransformParms() const override { return 3 ; }
 
       static std::string hitString() { return "EcalHitsES" ; }
 
@@ -86,7 +86,7 @@ class EcalPreshowerGeometry final : public CaloSubdetectorGeometry
 			    const GlobalPoint& f2 ,
 			    const GlobalPoint& f3 ,
 			    const CCGFloat*    parm ,
-			    const DetId&       detId   ) ;
+			    const DetId&       detId   ) override;
 
 
   /// is this detid present in the geometry?

diff --git a/Geometry/ForwardGeometry/interface/CastorTopology.h b/Geometry/ForwardGeometry/interface/CastorTopology.h
@@ -24,6 +24,7 @@ class CastorTopology : public CaloSubdetectorTopology {
   int exclude(int zside, HcalCastorDetId::Section section1, int isec1, int imod1, HcalCastorDetId::Section section2, int isec2, int imod2);
 
   /** Is this a valid cell id? */
+  using CaloSubdetectorTopology::valid;
   virtual bool valid(const HcalCastorDetId& id) const;
 
   /** Is this a valid cell id? */
@@ -44,6 +45,7 @@ class CastorTopology : public CaloSubdetectorTopology {
   virtual std::vector<DetId> down(const DetId& id) const;
 
   // how many channels (deph) for a given section
+  using CaloSubdetectorTopology::ncells;
   int ncells(HcalCastorDetId::Section section) const;
 
   //return first and last cell of each section

diff --git a/Geometry/ForwardGeometry/interface/IdealCastorTrapezoid.h b/Geometry/ForwardGeometry/interface/IdealCastorTrapezoid.h
@@ -62,6 +62,7 @@ class IdealCastorTrapezoid: public CaloCellGeometry
       CCGFloat an()  const ;
       CCGFloat dR()  const ;
 
+      using CaloCellGeometry::vocalCorners;
       virtual void vocalCorners( Pt3DVec&        vec ,
 				 const CCGFloat* pv  ,
 				 Pt3D&           ref  ) const ;

diff --git a/Geometry/ForwardGeometry/interface/ZdcTopology.h b/Geometry/ForwardGeometry/interface/ZdcTopology.h
@@ -25,6 +25,7 @@ class ZdcTopology : public CaloSubdetectorTopology {
   int exclude(int zside, HcalZDCDetId::Section section, int ich1, int ich2);
 
   /** Is this a valid cell id? */
+  using CaloSubdetectorTopology::valid;
   virtual bool valid(const HcalZDCDetId& id) const;
 
   /** Get the transverse (X) neighbors of the given cell*/
@@ -43,6 +44,7 @@ class ZdcTopology : public CaloSubdetectorTopology {
 
 
   // how many channels (deph) for a given section
+  using CaloSubdetectorTopology::ncells;
   int ncells(HcalZDCDetId::Section section) const;
 
   //return first and last cell of each section

diff --git a/Geometry/HGCalGeometry/interface/HGCalGeometry.h b/Geometry/HGCalGeometry/interface/HGCalGeometry.h
@@ -65,7 +65,7 @@ class HGCalGeometry final: public CaloSubdetectorGeometry {
   virtual void getSummary( CaloSubdetectorGeometry::TrVec&  trVector,
 			   CaloSubdetectorGeometry::IVec&   iVector,
 			   CaloSubdetectorGeometry::DimVec& dimVector,
-			   CaloSubdetectorGeometry::IVec& dinsVector ) const ;
+			   CaloSubdetectorGeometry::IVec& dinsVector ) const override;
 
   GlobalPoint getPosition( const DetId& id ) const;
 
@@ -99,6 +99,7 @@ class HGCalGeometry final: public CaloSubdetectorGeometry {
 protected:
 
   virtual unsigned int indexFor(const DetId& id) const override;
+  using CaloSubdetectorGeometry::sizeForDenseIndex;
   unsigned int sizeForDenseIndex() const;
 
   virtual const CaloCellGeometry* cellGeomPtr( uint32_t index ) const override;

diff --git a/Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h b/Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h
@@ -12,10 +12,10 @@ class GluedGeomDet final : public TrackerGeomDet {
   virtual ~GluedGeomDet();
 
   bool isLeaf() const override { return false;}
-  virtual std::vector<const GeomDet*> components() const;
+  virtual std::vector<const GeomDet*> components() const override;
 
   // Which subdetector
-  virtual SubDetector subDetector() const {return theMonoDet->subDetector();}
+  virtual SubDetector subDetector() const override {return theMonoDet->subDetector();}
 
   const GeomDetUnit* monoDet() const { return theMonoDet;}
   const GeomDetUnit* stereoDet() const { return theStereoDet;}

diff --git a/Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h b/Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h
@@ -42,7 +42,7 @@ class PixelGeomDetUnit final : public TrackerGeomDet {
   virtual const PixelTopology& specificTopology() const;
 
   /// Return pointer to surface deformation.
-  virtual const SurfaceDeformation * surfaceDeformation() const { 
+  virtual const SurfaceDeformation * surfaceDeformation() const override { 
     return theTopology->surfaceDeformation();
   }
 
@@ -51,7 +51,7 @@ class PixelGeomDetUnit final : public TrackerGeomDet {
 private:
 
   /// set the SurfaceDeformation for this StripGeomDetUnit to proxy topology.
-  virtual void setSurfaceDeformation(const SurfaceDeformation * deformation);
+  virtual void setSurfaceDeformation(const SurfaceDeformation * deformation) override;
 
   std::unique_ptr<ProxyPixelTopology> theTopology;
 };

diff --git a/Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h b/Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h
@@ -12,10 +12,10 @@ class StackGeomDet : public TrackerGeomDet{
   virtual ~StackGeomDet();
 
   bool isLeaf() const override { return false;}
-  virtual std::vector<const GeomDet*> components() const;
+  virtual std::vector<const GeomDet*> components() const override;
 
   // Which subdetector
-  virtual SubDetector subDetector() const { return theLowerDet->subDetector(); };
+  virtual SubDetector subDetector() const override { return theLowerDet->subDetector(); };
 
   const GeomDetUnit* lowerDet() const { return theLowerDet; };
   const GeomDetUnit* upperDet() const { return theUpperDet; };

diff --git a/Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h b/Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h
@@ -42,7 +42,7 @@ class StripGeomDetUnit final : public TrackerGeomDet {
   virtual const StripTopology& specificTopology() const;
 
   /// Return pointer to surface deformation.
-  virtual const SurfaceDeformation * surfaceDeformation() const { 
+  virtual const SurfaceDeformation * surfaceDeformation() const override { 
     return theTopology->surfaceDeformation();
   }
 
@@ -52,7 +52,7 @@ class StripGeomDetUnit final : public TrackerGeomDet {
 private:
 
   /// set the SurfaceDeformation for this StripGeomDetUnit to proxy topology.
-  virtual void setSurfaceDeformation(const SurfaceDeformation * deformation);
+  virtual void setSurfaceDeformation(const SurfaceDeformation * deformation) override;
 
   std::unique_ptr<ProxyStripTopology> theTopology;
 };