Merge branch 'using.ActsDataPreparation-20240304' into 'main'

ActsDataPreparation: Fix using declarations.

See merge request atlas/athena!69473

Tracking/Acts/ActsDataPreparation/src/PixelClusteringTool.cxx

@@ -3,9 +3,6 @@
 */
 
 #include "PixelClusteringTool.h"
-using ActsTrk::getCellRow;
-using ActsTrk::getCellColumn;
-using ActsTrk::getCellLabel;
 
 #include <Acts/Clusterization/Clusterization.hpp>
 

Tracking/Acts/ActsDataPreparation/src/PixelClusteringTool.h

@@ -14,9 +14,11 @@
 #include "SiClusterizationTool/PixelRDOTool.h"
 #include "xAODInDetMeasurement/PixelClusterContainer.h"
 
-namespace ActsTrk {
+namespace InDet {
 
 // Helper functions for use with ACTS clusterization
+// Put these in the InDet namespace so that ACTS can find them
+// via ADL.
 //
 inline int getCellRow(const InDet::UnpackedPixelRDO& cell)
 {
@@ -34,6 +36,12 @@ inline int& getCellLabel(InDet::UnpackedPixelRDO& cell)
 }
 
 
+} // namespace InDet
+
+
+namespace ActsTrk {
+
+
 class PixelClusteringTool : public extends<AthAlgTool,IPixelClusteringTool> {
 public: