CaloClusterCorrection: Remove reference to CxxUtils/make_unique.h.

Remove reference to obsolete CxxUtils/make_unique.h.

Calorimeter/CaloClusterCorrection/src/CaloClusterCorrectionCommon.cxx

@@ -17,7 +17,6 @@
 #include "CaloDetDescr/CaloDetectorElements.h"
 #include "CaloGeoHelpers/CaloPhiRange.h"
 #include "CaloIdentifier/CaloCell_ID.h"
-#include "CxxUtils/make_unique.h"
 #include <cmath>
 #include <cassert>
 

LArCalorimeter/LArG4/LArG4H8SD/CMakeLists.txt

@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PRIVATE
                           Calorimeter/CaloG4Sim
                           Calorimeter/CaloSimEvent
                           Control/AthenaKernel
-                          Control/CxxUtils
                           Control/StoreGate
                           GaudiKernel
                           LArCalorimeter/LArG4/LArG4Code )
@@ -28,5 +27,5 @@ atlas_add_component( LArG4H8SD
                    PRIVATE_INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
                    LINK_LIBRARIES CaloG4SimLib StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel CaloSimEvent CxxUtils GaudiKernel LArG4Code )
+                   PRIVATE_LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel CaloSimEvent GaudiKernel LArG4Code )
 

LArCalorimeter/LArG4/LArG4H8SD/src/LArG4H8CalibSDTool.cc

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArG4H8CalibSDTool.h"
@@ -19,7 +19,6 @@
 // #include "H8CalibrationDefaultCalculator.h"
 
 // #include "CaloG4Sim/CalibrationDefaultProcessing.h"
-#include "CxxUtils/make_unique.h"
 
 
 LArG4H8CalibSDTool::LArG4H8CalibSDTool(const std::string& type, const std::string& name, const IInterface *parent)
@@ -100,7 +99,7 @@ StatusCode LArG4H8CalibSDTool::initializeSD()
 StatusCode LArG4H8CalibSDTool::Gather()
 {
   // In this case, *unlike* other SDs, the *tool* owns the collection
-  if (!m_HitColl.isValid()) m_HitColl = CxxUtils::make_unique<CaloCalibrationHitContainer>(m_HitColl.name());
+  if (!m_HitColl.isValid()) m_HitColl = std::make_unique<CaloCalibrationHitContainer>(m_HitColl.name());
   m_barCrySD  ->EndOfAthenaEvent( &*m_HitColl );
   m_bpInSD    ->EndOfAthenaEvent( &*m_HitColl );
   m_bpDeadSD  ->EndOfAthenaEvent( &*m_HitColl );

TileCalorimeter/TileTrackingGeometry/CMakeLists.txt

@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Tracking/TrkDetDescr/TrkDetDescrInterfaces
                           PRIVATE
                           Calorimeter/CaloDetDescr
-                          Control/CxxUtils
                           Control/StoreGate
                           TileCalorimeter/TileDetDescr
                           Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv
@@ -32,7 +31,7 @@ atlas_add_component( TileTrackingGeometry
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces CaloDetDescrLib CxxUtils StoreGateLib SGtests GeoPrimitives TileDetDescr TrkDetDescrGeoModelCnv TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces CaloDetDescrLib StoreGateLib SGtests GeoPrimitives TileDetDescr TrkDetDescrGeoModelCnv TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes )
 
 # Install files from the package:
 atlas_install_headers( TileTrackingGeometry )

TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -53,10 +53,9 @@
 #include "GaudiKernel/SystemOfUnits.h"
 // StoreGate
 #include "StoreGate/StoreGateSvc.h"
-#include "CxxUtils/make_unique.h"
 
 using Gaudi::Units::mm;
-using CxxUtils::make_unique;
+using std::make_unique;
 
 // constructor
 Tile::TileVolumeBuilder::TileVolumeBuilder(const std::string& t, const std::string& n, const IInterface* p) :
@@ -428,7 +427,7 @@ const std::vector<const Trk::TrackingVolume*>* Tile::TileVolumeBuilder::tracking
 
   // combined girder volume
   {
-    auto tileGirderBounds = CxxUtils::make_unique<Trk::CylinderVolumeBounds>
+    auto tileGirderBounds = std::make_unique<Trk::CylinderVolumeBounds>
       (tileBarrelGirderBounds->innerRadius(),
        tileBarrelGirderBounds->outerRadius(),
        tileZ);