Skip to content
Snippets Groups Projects
Commit f517d692 authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'dev/master/updateGaudi' into 'master'

update Gaudi to v30r3.008

See merge request atlas/athena!15365
parents 3f1a4209 79a1db91
No related branches found
No related tags found
No related merge requests found
......@@ -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(); }
......
......@@ -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(); }
......
......@@ -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(); }
......
......@@ -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
......
......@@ -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
......
......@@ -9,4 +9,4 @@
AthSimulationExternalsVersion = 2.0.13
# The version of atlas/Gaudi to use:
GaudiVersion = v30r3.007
GaudiVersion = v30r3.008
......@@ -9,4 +9,4 @@
AthenaExternalsVersion = 2.0.13
# The version of atlas/Gaudi to use:
GaudiVersion = v30r3.007
GaudiVersion = v30r3.008
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment