diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
index d5bc14040a790e8e85b8d2c76d8afe68c38fb94f..ce7cd474ccbae34c222adbfb390bcc1b9eeb684d 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
@@ -10,8 +10,6 @@ atlas_depends_on_subdirs( PRIVATE
Control/AthContainers
Control/AthenaBaseComps
Control/AthenaKernel
- Control/CxxUtils
- Control/DataModel
Control/Navigation
Control/RootUtils
Control/SGTools
@@ -31,7 +29,7 @@ atlas_add_component( D3PDMakerCoreComps
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel CxxUtils DataModel Navigation RootUtils RootUtilsPyROOT SGTools AthenaPoolCnvSvcLib GaudiKernel ParticleEvent D3PDMakerUtils )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT SGTools AthenaPoolCnvSvcLib GaudiKernel ParticleEvent D3PDMakerUtils )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/cmt/requirements b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/cmt/requirements
index 4a414601006ea5574d92088aa01d2331116bdbd2..9035531485f88a1b7476090bb2f53ba3e2af724c 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/cmt/requirements
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/cmt/requirements
@@ -7,13 +7,11 @@ private
use GaudiInterface GaudiInterface-* External
use AtlasBoost AtlasBoost-* External
use AtlasROOT AtlasROOT-* External
-use CxxUtils CxxUtils-* Control
use RootUtils RootUtils-* Control
use AthenaKernel AthenaKernel-* Control
use AthContainers AthContainers-* Control
use SGTools SGTools-* Control
use Navigation Navigation-* Control
-use DataModel DataModel-* Control
use AthenaBaseComps AthenaBaseComps-* Control
use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
use ParticleEvent ParticleEvent-* PhysicsAnalysis/AnalysisCommon
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/python/MakerAlg.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/python/MakerAlg.py
index cfd6992bd2d17cf02be3d20c7332e2a8ae3c3b9d..812ec1eb94ef850321943f58addd84868f031fc8 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/python/MakerAlg.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/python/MakerAlg.py
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: MakerAlg.py 711763 2015-11-30 21:06:16Z ssnyder $
+# $Id: MakerAlg.py 711762 2015-11-30 21:06:11Z ssnyder $
#
# @file D3PDMakerCoreComps/python/MakerAlg.py
# @author scott snyder <snyder@bnl.gov>
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/AuxDataFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/AuxDataFillerTool.cxx
index f4e886b3b5572b670d21fd1572352cc80d36b491..0f339034f926c63c082d3b42d809d3a5c0ff80fc 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/AuxDataFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/AuxDataFillerTool.cxx
@@ -15,7 +15,6 @@
#include "AthContainers/AuxElement.h"
#include "AthContainers/AuxTypeRegistry.h"
#include "AthenaKernel/errorcheck.h"
-#include "CxxUtils/make_unique.h"
#include "boost/algorithm/string/trim.hpp"
#include "boost/algorithm/string/split.hpp"
#include "TROOT.h"
@@ -253,7 +252,7 @@ StatusCode AuxDataFillerTool::parseVars()
}
try {
- m_vars.push_back (CxxUtils::make_unique<Var>
+ m_vars.push_back (std::make_unique<Var>
(name, docstring, labels, label_classes,
defstring, has_default));
}
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h
index 7ae97a211c2aebe5d857d05cd6235b585e7d63d2..73df0269c0c305f46d290b65ca3653666a1848c6 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h
@@ -4,7 +4,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: CollectionGetterRegistryTool.h 618070 2014-09-22 19:05:34Z ssnyder $
+// $Id: CollectionGetterRegistryTool.h 781599 2016-11-01 15:42:00Z ssnyder $
/**
* @file D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h
* @author scott snyder <snyder@bnl.gov>
@@ -19,9 +19,9 @@
#include "D3PDMakerInterfaces/ICollectionGetterRegistryTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "CxxUtils/unordered_map.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
+#include <unordered_map>
class IJobOptionsSvc;
@@ -92,7 +92,7 @@ private:
ServiceHandle<IToolSvc> m_toolsvc;
/// Map from getter labels to instances.
- typedef SG::unordered_map<std::string, D3PD::ICollectionGetterTool*> map_t;
+ typedef std::unordered_map<std::string, D3PD::ICollectionGetterTool*> map_t;
map_t m_collection_map;
};
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.cxx
index a22d60cda25006ee86a3422557650c4e19a3ed87..4c139236a1ee6654bcecf73cd3c3e4e5f3966ffd 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: SGDataVectorGetterTool.cxx 648781 2015-02-22 14:29:36Z ssnyder $
+// $Id: SGDataVectorGetterTool.cxx 790090 2016-12-16 05:31:29Z ssnyder $
/**
* @file D3PDMakerCoreComps/src/SGDataVectorGetterTool.h
* @author scott snyder <snyder@bnl.gov>
@@ -12,7 +12,7 @@
#include "SGDataVectorGetterTool.h"
-#include "DataModel/tools/DVLInfo.h"
+#include "AthContainers/tools/DVLInfo.h"
#include "TROOT.h"
#include "TMethodCall.h"
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.h
index 79c3a3ea3ec8110112187e4f1df3b338c3464c50..8a3ea7a1e902ae25c55b9db776220645c0c35f34 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/SGDataVectorGetterTool.h
@@ -4,7 +4,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: SGDataVectorGetterTool.h 560175 2013-09-03 02:10:39Z ssnyder $
+// $Id: SGDataVectorGetterTool.h 790090 2016-12-16 05:31:29Z ssnyder $
/**
* @file D3PDMakerCoreComps/src/SGDataVectorGetterTool.h
* @author scott snyder <snyder@bnl.gov>
@@ -20,7 +20,7 @@
#include "D3PDMakerUtils/CollectionGetterTool.h"
#include "D3PDMakerUtils/SGGetterImpl.h"
#include "D3PDMakerUtils/TypeConverter.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "AthenaPoolCnvSvc/IAthenaPoolCnvSvc.h"
#include "AthenaKernel/errorcheck.h"
#include "GaudiKernel/ServiceHandle.h"