diff --git a/Control/StoreGateBindings/CMakeLists.txt b/Control/StoreGateBindings/CMakeLists.txt index 0cef278f03cd4c514ad1e1378ca19664ee22ed38..3f973bbd6ebe2e0298924cf205bd1c5b1b08f680 100644 --- a/Control/StoreGateBindings/CMakeLists.txt +++ b/Control/StoreGateBindings/CMakeLists.txt @@ -8,7 +8,6 @@ atlas_subdir( StoreGateBindings ) # Declare the package's dependencies: atlas_depends_on_subdirs( PRIVATE Control/AthenaKernel - Control/CxxUtils Control/DataModelRoot Control/SGTools Control/StoreGate @@ -24,13 +23,13 @@ atlas_add_library( StoreGateBindings PUBLIC_HEADERS StoreGateBindings PRIVATE_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} LINK_LIBRARIES StoreGateLib SGtests - PRIVATE_LINK_LIBRARIES ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils DataModelRoot SGTools GaudiKernel ) + PRIVATE_LINK_LIBRARIES ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel DataModelRoot SGTools GaudiKernel ) atlas_add_dictionary( StoreGateBindingsDict src/StoreGateBindingsDict.h StoreGateBindings/selection.xml INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils DataModelRoot SGTools StoreGateLib SGtests GaudiKernel StoreGateBindings ) + LINK_LIBRARIES ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel DataModelRoot SGTools StoreGateLib SGtests GaudiKernel StoreGateBindings ) # Install files from the package: atlas_install_python_modules( python/*.py ) diff --git a/Control/StoreGateBindings/cmt/requirements b/Control/StoreGateBindings/cmt/requirements index 8f3a502d2fbb2453f4cf0070bb5e6a99d09e1d05..0940450edadc6f5052916205c160cab9f7a176c9 100644 --- a/Control/StoreGateBindings/cmt/requirements +++ b/Control/StoreGateBindings/cmt/requirements @@ -17,7 +17,6 @@ use GaudiInterface GaudiInterface-* External use AtlasPython AtlasPython-* External use AtlasROOT AtlasROOT-* External use AtlasReflex AtlasReflex-* External -use CxxUtils CxxUtils-* Control use AthenaKernel AthenaKernel-* Control use SGTools SGTools-* Control use StoreGate StoreGate-* Control diff --git a/Control/StoreGateBindings/src/PyThinning.cxx b/Control/StoreGateBindings/src/PyThinning.cxx index 099515b30de52b3cf47aa96f55e6ff84bef60a12..a272d763ab3216c5702bac39f5f0581c1622be78 100755 --- a/Control/StoreGateBindings/src/PyThinning.cxx +++ b/Control/StoreGateBindings/src/PyThinning.cxx @@ -16,7 +16,6 @@ #include "AthenaKernel/IThinningSvc.h" // SGTools includes -#include "CxxUtils/unordered_map.h" // move to STL once available #include "SGTools/DataBucketBase.h" #include "SGTools/BaseInfo.h" diff --git a/Control/StoreGateBindings/src/SgPyDataModel.h b/Control/StoreGateBindings/src/SgPyDataModel.h index 027c0ea42c79a6befe5a084ed903e46e40eb5f42..68e6728e2d8e8b30e20c17bab49e9af7a0f43798 100644 --- a/Control/StoreGateBindings/src/SgPyDataModel.h +++ b/Control/StoreGateBindings/src/SgPyDataModel.h @@ -22,7 +22,6 @@ extern CLID PyCLID; // SGTools includes -#include "CxxUtils/unordered_map.h" // move to STL once available #include "SGTools/DataBucketBase.h" #include "SGTools/BaseInfo.h" @@ -35,6 +34,8 @@ extern CLID PyCLID; // PyROOT includes #include "AthenaPyRoot.h" +#include <unordered_map> + // fwd declares namespace SG { struct PyProxyMgr; } namespace SG { struct PyProxyDict; } @@ -195,11 +196,11 @@ namespace SG { /// a dictionary of 'typename' -> CLID (and reverse CLID->'typename') PyObject* m_clids; - typedef SG::unordered_map<StoreGateSvc*,SG::PyProxyDict*> PyProxyMap_t; + typedef std::unordered_map<StoreGateSvc*,SG::PyProxyDict*> PyProxyMap_t; PyProxyMap_t m_proxyMap; /// a dictionary of CLID -> reflex typename - typedef SG::unordered_map<CLID, std::string> ClidMap_t; + typedef std::unordered_map<CLID, std::string> ClidMap_t; ClidMap_t m_clidMap; static diff --git a/Control/StoreGateBindings/src/StoreGatePyExt.cxx b/Control/StoreGateBindings/src/StoreGatePyExt.cxx index b3b3c5a1fe364a0c1fcef5d78604bce02144f633..3a99a9e6ee88133d171335977973e91d7b5079cd 100755 --- a/Control/StoreGateBindings/src/StoreGatePyExt.cxx +++ b/Control/StoreGateBindings/src/StoreGatePyExt.cxx @@ -16,7 +16,6 @@ #include "AthenaKernel/IClassIDSvc.h" // SGTools includes -#include "CxxUtils/unordered_map.h" // move to STL once available #include "SGTools/DataBucketBase.h" #include "SGTools/BaseInfo.h" #include "SGTools/ClassID_traits.h"