From ad2cdca4b8b593fe4d6d2cdc66a53a46244c6512 Mon Sep 17 00:00:00 2001
From: Charles Leggett <charles.g.leggett@gmail.com>
Date: Thu, 22 Dec 2016 06:24:15 +0100
Subject: [PATCH] updates for Property modernization (TrigGenericAlgs-00-00-67)
* don't forward declare Property for Gaudi v28 compat
* endreq -> endmsg
* tag TrigGenericAlgs-00-00-67
M src/ROBRequestAlgo.h
M src/TrigRoiUpdater.cxx
M TrigGenericAlgs/L1CorrelationAlgo.h
M TrigGenericAlgs/DetectorTimingAlgo.h
Former-commit-id: 1daf1548ba63f7a358deed72b74ded5b0abe82d0
---
.../TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h | 7 +------
.../TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h | 2 +-
.../TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h | 2 +-
.../TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx | 3 ++-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
index 570ff946981..af995feda4a 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
@@ -16,6 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/Property.h"
#include <string>
#include <vector>
@@ -40,12 +41,6 @@
#include "xAODTrigL1Calo/TriggerTowerContainer.h"
-/// for muon tests
-class Property;
-
-
-
-
class DetectorTimingAlgo : public HLT::AllTEAlgo {
public:
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
index 8c437df7c32..4f0bc2b4939 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
@@ -16,6 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/Property.h"
#include <string>
#include <vector>
@@ -31,7 +32,6 @@
#include "xAODTrigger/TrigCompositeContainer.h"
class IROBDataProviderSvc;
-class Property;
typedef std::vector<uint32_t> ROBList;
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
index 019b1ce8f49..0d3c4318a23 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
@@ -16,6 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/Property.h"
#include <string>
#include <vector>
@@ -23,7 +24,6 @@
#include <stdint.h>
class IROBDataProviderSvc;
-class Property;
typedef std::vector<uint32_t> ROBList;
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
index 23647c828f7..bbbac4d8640 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
@@ -66,7 +66,8 @@ namespace PESA
int priority = 100;
pIncsvc->addListener( this, "BeginEvent", priority);
} else {
- msg(MSG::ERROR) << "No connection to incidentSvc used for cleanup" << endreq;
+ msg(MSG::ERROR) << "No connection to incidentSvc used for cleanup"
+ << endmsg;
return StatusCode::FAILURE;
}
--
GitLab