Merge branch 'datamodel.IDC_OverlayBase-20180322' into 'master'

IDC_OverlayBase: DataModel -> AthContainers.

See merge request atlas/athena!9945

Former-commit-id: eef21765

Event/EventOverlay/IDC_OverlayBase/CMakeLists.txt

@@ -8,12 +8,12 @@ atlas_subdir( IDC_OverlayBase )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
-                          Control/DataModel
+                          Control/AthContainers
                           DetectorDescription/Identifier
                           Event/EventOverlay/OverlayAlgBase )
 
 # Component(s) in the package:
 atlas_add_library( IDC_OverlayBase
                    PUBLIC_HEADERS IDC_OverlayBase
-                   LINK_LIBRARIES AthenaBaseComps DataModel Identifier OverlayAlgBase )
+                   LINK_LIBRARIES AthenaBaseComps AthContainers Identifier OverlayAlgBase )
 

Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayBase.icc

@@ -12,7 +12,7 @@
 
 #include "AthenaBaseComps/AthMsgStreamMacros.h"
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 #include <sstream>
 #include <typeinfo>

Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc

@@ -11,12 +11,11 @@
 
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/WriteHandle.h"
-#include "CxxUtils/make_unique.h"
  
 
 #include "AthenaBaseComps/AthMsgStreamMacros.h"
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 #include <sstream>