From 1d63181c11a03dbbd222ee57d09134effb3785e7 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 4 Dec 2020 09:58:27 -0500
Subject: [PATCH] TRT_ReadoutGeometry: Fix clang warnings.
Missing override keywords.
Don't use std::move on a non-lvalue.
---
.../TRT_ReadoutGeometry/TRT_BarrelElement.h | 8 ++++----
.../TRT_ReadoutGeometry/TRT_EndcapElement.h | 10 +++++-----
.../TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx | 2 +-
.../TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h
index 8338c8bbd418..0a1cc4360326 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -131,12 +131,12 @@ namespace InDetDD {
const TRT_BarrelElement& operator=(const TRT_BarrelElement& right) = delete;
/** These transforms are effectively to the local coord
system of a straw derived from GeoModel -> hence CLHEP */
- HepGeom::Transform3D calculateStrawTransform(int straw) const;
+ virtual HepGeom::Transform3D calculateStrawTransform(int straw) const override;
HepGeom::Transform3D calculateLocalStrawTransform(int straw) const;
/** return the surface of the element */
- const Trk::Surface & elementSurface() const;
+ virtual const Trk::Surface & elementSurface() const override;
/** create the cache for the element */
- void createSurfaceCache() const;
+ virtual void createSurfaceCache() const override;
std::unique_ptr<SurfaceCache> createSurfaceCacheHelper() const;
// Private Member data:
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h
index 27fffa85bed5..0da3d309b493 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ namespace InDetDD {
virtual HepGeom::Transform3D defStrawTransform(int straw) const override final;
/** Active straw length */
- virtual const double & strawLength() const;
+ virtual const double & strawLength() const override;
/** StrawDirection. +1 if axis is in same direction as local coordinate, -1 otherwise. */
virtual int strawDirection() const override final;
@@ -103,14 +103,14 @@ namespace InDetDD {
private:
/** These transforms are effectively to the local coord
system of a straw derived from GeoModel -> hence CLHEP */
- HepGeom::Transform3D calculateStrawTransform(int straw) const;
+ virtual HepGeom::Transform3D calculateStrawTransform(int straw) const override;
HepGeom::Transform3D calculateLocalStrawTransform(int straw) const;
/** return the surface of the element */
- const Trk::Surface & elementSurface() const;
+ virtual const Trk::Surface & elementSurface() const override;
/** create the cache for the element */
- void createSurfaceCache() const;
+ virtual void createSurfaceCache() const override;
std::unique_ptr<SurfaceCache> createSurfaceCacheHelper() const;
/** create the cache for the straw of identifier id */
void createSurfaceCache(Identifier id) const;
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
index 80e442aedac6..dd611ab2f1ed 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
@@ -197,7 +197,7 @@ void TRT_BarrelElement::createSurfaceCache() const
{
// create the surface cache
if (!m_surfaceCache) {
- m_surfaceCache.set(std::move(createSurfaceCacheHelper()));
+ m_surfaceCache.set(createSurfaceCacheHelper());
}
// creaete the surface (only if needed, links are still ok even if cache
// update)
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
index 7f13cc04c672..122ae59933a3 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
@@ -244,7 +244,7 @@ void
TRT_EndcapElement::createSurfaceCache() const
{
if (!m_surfaceCache) {
- m_surfaceCache.set(std::move(createSurfaceCacheHelper()));
+ m_surfaceCache.set(createSurfaceCacheHelper());
}
// create the surface if needed
if (!m_surface) {
--
GitLab