Merge pull request #49213 from smuzaffar/geometry-llvm21-virtual-method-final-class

[GEOMETRY] Fix for virtual method inside a final class

Author: cmsbuild

Geometry/CaloTopology/interface/CaloTowerTopology.h

@@ -18,7 +18,7 @@ class CaloTowerTopology final : public CaloSubdetectorTopology {
   ~CaloTowerTopology() override {}
   /// is this detid present in the Topology?
   bool valid(const DetId& id) const override;
-  virtual bool validDetId(const CaloTowerDetId& id) const;
+  bool validDetId(const CaloTowerDetId& id) const;
   /** Get the neighbors of the given cell in east direction*/
   std::vector<DetId> east(const DetId& id) const override;
   /** Get the neighbors of the given cell in west direction*/

Geometry/CommonTopologies/interface/PixelGeomDetType.h

@@ -20,7 +20,7 @@ class PixelGeomDetType final : public GeomDetType {
   // Access to topologies
   const Topology& topology() const override { return *theTopology; }
 
-  virtual const TopologyType& specificTopology() const { return *theTopology; }
+  const TopologyType& specificTopology() const { return *theTopology; }
 
   PixelGeomDetType& operator=(const PixelGeomDetType& other) = delete;
   PixelGeomDetType(const PixelGeomDetType& other) = delete;

Geometry/CommonTopologies/interface/PixelGeomDetUnit.h

@@ -35,10 +35,10 @@ class PixelGeomDetUnit final : public TrackerGeomDet {
   /// the proxy topology (through topology() and specificTopology()) which includes
   /// corrections for the surface deformations, and once via the GeomDetType
   /// (through type().topology() and the like).
-  virtual const PixelGeomDetType& specificType() const;
+  const PixelGeomDetType& specificType() const;
 
   /// Returns a reference to the pixel proxy topology
-  virtual const PixelTopology& specificTopology() const;
+  const PixelTopology& specificTopology() const;
 
   /// Return pointer to surface deformation.
   const SurfaceDeformation* surfaceDeformation() const override { return theTopology->surfaceDeformation(); }

Geometry/CommonTopologies/interface/ProxyPixelTopology.h

@@ -85,14 +85,14 @@ class ProxyPixelTopology final : public PixelTopology {
   bool isItEdgePixelInY(int iybin) const override { return specificTopology().isItEdgePixelInY(iybin); }
   bool isItEdgePixel(int ixbin, int iybin) const override { return specificTopology().isItEdgePixel(ixbin, iybin); }
 
-  virtual const GeomDetType &type() const { return *theType; }
+  const GeomDetType &type() const { return *theType; }
 
-  virtual PixelGeomDetType const &specificType() const { return *theType; }
+  PixelGeomDetType const &specificType() const { return *theType; }
 
   const SurfaceDeformation *surfaceDeformation() const { return theSurfaceDeformation.operator->(); }
-  virtual void setSurfaceDeformation(const SurfaceDeformation *deformation);
+  void setSurfaceDeformation(const SurfaceDeformation *deformation);
 
-  virtual const PixelTopology &specificTopology() const { return specificType().specificTopology(); }
+  const PixelTopology &specificTopology() const { return specificType().specificTopology(); }
 
 private:
   /// Internal method to get correction of the position from SurfaceDeformation,

Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h

@@ -69,7 +69,7 @@ class TrapezoidalStripTopology final : public StripTopology {
   float radius() const { return theDistToBeam; }
 
 protected:
-  virtual float shiftOffset(float pitch_fraction);
+  float shiftOffset(float pitch_fraction);
 
 private:
   int theNumberOfStrips;

Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h

@@ -52,7 +52,7 @@ class EcalPreshowerGeometry final : public CaloSubdetectorGeometry {
   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;
+  DetId getClosestCellInPlane(const GlobalPoint& r, int plane) const;
 
   void initializeParms() override;
   unsigned int numberOfTransformParms() const override { return 3; }

Geometry/HGCalGeometry/interface/HGCalGeometry.h

@@ -104,7 +104,7 @@ class HGCalGeometry final : public CaloSubdetectorGeometry {
   */
   DetIdSet getCells(const GlobalPoint& r, double dR) const override;
 
-  virtual void fillNamedParams(DDFilteredView fv);
+  void fillNamedParams(DDFilteredView fv);
   void initializeParms() override;
 
   static std::string producerTag() { return "HGCal"; }

Geometry/HGCalGeometry/interface/HGCalTBGeometry.h

@@ -100,7 +100,7 @@ class HGCalTBGeometry final : public CaloSubdetectorGeometry {
   */
   DetIdSet getCells(const GlobalPoint& r, double dR) const override;
 
-  virtual void fillNamedParams(DDFilteredView fv);
+  void fillNamedParams(DDFilteredView fv);
   void initializeParms() override;
 
   static std::string producerTag() { return "HGCalTB"; }

Geometry/MTDGeometryBuilder/interface/MTDGeomDetType.h

@@ -21,7 +21,7 @@ class MTDGeomDetType final : public GeomDetType {
   // Access to topologies
   const Topology& topology() const override { return *theTopology; }
 
-  virtual const TopologyType& specificTopology() const { return *theTopology; }
+  const TopologyType& specificTopology() const { return *theTopology; }
 
   MTDGeomDetType& operator=(const MTDGeomDetType& other) = delete;
   MTDGeomDetType(const MTDGeomDetType& other) = delete;

Geometry/MTDGeometryBuilder/interface/MTDGeomDetUnit.h

@@ -35,10 +35,10 @@ class MTDGeomDetUnit final : public MTDGeomDet {
   /// the proxy topology (through topology() and specificTopology()) which includes
   /// corrections for the surface deformations, and once via the GeomDetType
   /// (through type().topology() and the like).
-  virtual const MTDGeomDetType& specificType() const;
+  const MTDGeomDetType& specificType() const;
 
   /// Returns a reference to the pixel proxy topology
-  virtual const PixelTopology& specificTopology() const;
+  const PixelTopology& specificTopology() const;
 
   /// Return pointer to surface deformation.
   const SurfaceDeformation* surfaceDeformation() const override { return theTopology->surfaceDeformation(); }