diff --git a/Control/AthenaKernel/test/SlotSpecificObj_test.cxx b/Control/AthenaKernel/test/SlotSpecificObj_test.cxx index 5089dc959c6758ff04db0ec8eb3aba84bbeee41e..50c33002d0ceb69e2905bb0074d62e5e70ac2ead 100644 --- a/Control/AthenaKernel/test/SlotSpecificObj_test.cxx +++ b/Control/AthenaKernel/test/SlotSpecificObj_test.cxx @@ -35,8 +35,6 @@ public: virtual StatusCode selectStore(size_t /*partitionIndex*/) override { std::abort(); } virtual StatusCode clearStore(size_t /*partitionIndex*/) override { std::abort(); } virtual StatusCode setNumberOfStores(size_t /*slots*/) override { std::abort(); } - virtual DataObjIDColl getNewDataObjects() override { std::abort(); } - virtual void addNewDataObjects( DataObjIDColl& /*products*/ ) override{ std::abort(); } virtual bool exists( const DataObjID& ) override { std::abort(); } virtual size_t allocateStore( int /*evtnumber*/ ) override { std::abort(); } virtual StatusCode freeStore( size_t /*partitionIndex*/ ) override { std::abort(); } diff --git a/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx b/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx index ddc2525b8528bb19a109852f890995915750d0b3..861c2c376d9f0ca19faf97f872994db794ad62c3 100644 --- a/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx +++ b/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx @@ -240,8 +240,6 @@ public: virtual StatusCode selectStore( size_t ) override { std::abort(); } virtual StatusCode clearStore( size_t ) override { std::abort(); } virtual StatusCode setNumberOfStores( size_t ) override { std::abort(); } - virtual void addNewDataObjects( DataObjIDColl& ) override { std::abort(); } - virtual DataObjIDColl getNewDataObjects() override { std::abort(); } virtual bool exists( const DataObjID& ) override { std::abort(); } virtual size_t allocateStore( int ) override { std::abort(); } virtual StatusCode freeStore( size_t ) override { std::abort(); } diff --git a/Control/AthenaServices/test/RCUSvc_test.cxx b/Control/AthenaServices/test/RCUSvc_test.cxx index f229c3dc4b2665d7e987d853e6587d75658783ee..2b56e9f6817015c6e56a0b9942cef511cb806041 100644 --- a/Control/AthenaServices/test/RCUSvc_test.cxx +++ b/Control/AthenaServices/test/RCUSvc_test.cxx @@ -46,8 +46,6 @@ public: virtual StatusCode selectStore(size_t /*partitionIndex*/) override { std::abort(); } virtual StatusCode clearStore(size_t /*partitionIndex*/) override { std::abort(); } virtual StatusCode setNumberOfStores(size_t /*slots*/) override { std::abort(); } - virtual DataObjIDColl getNewDataObjects() override { std::abort(); } - virtual void addNewDataObjects( DataObjIDColl& /*products*/ ) override { std::abort(); } virtual bool exists( const DataObjID& ) override { std::abort(); } virtual size_t allocateStore( int /*evtnumber*/ ) override { std::abort(); } virtual StatusCode freeStore( size_t /*partitionIndex*/ ) override { std::abort(); } diff --git a/Control/StoreGate/src/SGHiveMgrSvc.cxx b/Control/StoreGate/src/SGHiveMgrSvc.cxx index 2accce685b8e9998b7ad7992687c6d43ced353b2..08b84d9a9fe0a9dcde7a9c83926b515e60e05ff2 100644 --- a/Control/StoreGate/src/SGHiveMgrSvc.cxx +++ b/Control/StoreGate/src/SGHiveMgrSvc.cxx @@ -144,18 +144,6 @@ size_t HiveMgrSvc::freeSlots() { return m_freeSlots; } - -DataObjIDColl HiveMgrSvc::getNewDataObjects() { - // FIXME: to be removed - DataObjIDColl products; - return products; -} - -void HiveMgrSvc::addNewDataObjects( DataObjIDColl& /*products*/ ){ - // FIXME - error() << "addNewDataObjects(...) not implemented!" << endmsg; -} - bool HiveMgrSvc::exists( const DataObjID& id) { // this should only get called in error situations, so we // don't care if it's slow diff --git a/Control/StoreGate/src/SGHiveMgrSvc.h b/Control/StoreGate/src/SGHiveMgrSvc.h index beea28d5b0d7a8f03cc64760e460e6aa98d3b07b..b74cd7ac88ebe57c453b63b9e38993cff6e15de6 100644 --- a/Control/StoreGate/src/SGHiveMgrSvc.h +++ b/Control/StoreGate/src/SGHiveMgrSvc.h @@ -62,19 +62,6 @@ public: */ virtual size_t getNumberOfStores() const override; - /** explicitly notify the presence of new object in the store - * - * @param products [IN] Location of new objects - */ - virtual void addNewDataObjects( DataObjIDColl& products ) override; - - /** Get the latest new data objects registered in store. - * - * @param products [IN] Slot number (event slot) * - * @return Status code indicating failure or success. - */ - virtual DataObjIDColl getNewDataObjects() override; - /** Check if a data object exists in store. * TODO: remove the method ASA a cross-experiment * event data store interface emerges diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt index 29fc225a8ae2d7f2513ba4175934d08d2dba2e54..d3dabb622d7e8c42d0f02dee7a1f87057adf3c04 100644 --- a/Projects/AthSimulation/externals.txt +++ b/Projects/AthSimulation/externals.txt @@ -9,4 +9,4 @@ AthSimulationExternalsVersion = 2.0.13 # The version of atlas/Gaudi to use: -GaudiVersion = v30r3.007 +GaudiVersion = v30r3.008 diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt index 1b01071d37cb430ce635d32578f24d95f7cd7fff..0191d7702118783068554af58be16c7338660c44 100644 --- a/Projects/Athena/externals.txt +++ b/Projects/Athena/externals.txt @@ -9,4 +9,4 @@ AthenaExternalsVersion = 2.0.13 # The version of atlas/Gaudi to use: -GaudiVersion = v30r3.007 +GaudiVersion = v30r3.008