From 506d88e2d35f77f325a965d5ea210e58847b78c3 Mon Sep 17 00:00:00 2001
From: Charles Leggett <charles.g.leggett@gmail.com>
Date: Wed, 25 Jan 2017 02:06:07 +0100
Subject: [PATCH] remove ifdef ATHENAHIVE (AthenaServices-01-60-51)
* remove ifdef ATHENAHIVE in order to merge 20.8.X and 22
* tag AthenaServices-01-60-51
M src/AthenaHiveEventLoopMgr.cxx
M src/components/AthenaServices_entries.cxx
---
Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx | 2 --
.../AthenaServices/src/components/AthenaServices_entries.cxx | 4 ----
2 files changed, 6 deletions(-)
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
index d0f14b9be8bf..3987be253db9 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifdef ATHENAHIVE
#define ATHENASERVICES_ATHENAHIVEEVENTLOOPMGR_CPP
#include <cassert>
@@ -1324,7 +1323,6 @@ StatusCode AthenaHiveEventLoopMgr::clearWBSlot(int evtSlot) {
//---------------------------------------------------------------------------
-#endif /*ATHENAHIVE*/
diff --git a/Control/AthenaServices/src/components/AthenaServices_entries.cxx b/Control/AthenaServices/src/components/AthenaServices_entries.cxx
index 31629b4831f0..f873d5b23834 100644
--- a/Control/AthenaServices/src/components/AthenaServices_entries.cxx
+++ b/Control/AthenaServices/src/components/AthenaServices_entries.cxx
@@ -31,18 +31,14 @@
#include "../MetaDataSvc.h"
#include "../OutputStreamSequencerSvc.h"
#include "../AthenaStopperAlg.h"
-#ifdef ATHENAHIVE
#include "../AthenaHiveEventLoopMgr.h"
-#endif
DECLARE_ALGORITHM_FACTORY( AthenaOutputStream )
DECLARE_ALGORITHM_FACTORY( AthenaConditionStream )
DECLARE_ALGORITHM_FACTORY( TestRandomSeqAlg )
DECLARE_SERVICE_FACTORY( MultipleEventLoopMgr )
DECLARE_SERVICE_FACTORY( AthenaEventLoopMgr )
-#ifdef ATHENAHIVE
DECLARE_SERVICE_FACTORY( AthenaHiveEventLoopMgr )
-#endif
DECLARE_SERVICE_FACTORY( PyAthenaEventLoopMgr )
DECLARE_SERVICE_FACTORY( SimplePOSIXTimeKeeperSvc )
DECLARE_SERVICE_FACTORY( MixingEventSelector )
--
GitLab