From e15d09b2a9500c21357f2fa75fbf7a4f8cf3e563 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Tue, 22 Aug 2017 17:03:29 +0200
Subject: [PATCH] TrigBjetHypo: Using directive placement.

Using directives should not be in the global namespace in headers.

Also add a few missing virtual keywords.
---
 .../TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.cxx  | 2 ++
 .../TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.h    | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.cxx
index 59dc2d8c565..be58107a9fd 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.cxx
@@ -5,6 +5,8 @@
 #include "GaudiKernel/Property.h"
 #include "TrigBjetHypoAlg.h"
 
+using namespace TrigCompositeUtils;
+
 TrigBjetHypoAlg::TrigBjetHypoAlg( const std::string& name, 
 				      ISvcLocator* pSvcLocator ) : 
   ::AthReentrantAlgorithm( name, pSvcLocator ),
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.h
index 0bce3dc17be..121959384ec 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlg.h
@@ -21,7 +21,6 @@
  * @class Implements b-jet selection for the new HLT framework
  * @brief 
  **/
-using namespace TrigCompositeUtils;
 
 class TrigBjetHypoAlg
   : public ::AthReentrantAlgorithm
@@ -32,9 +31,9 @@ class TrigBjetHypoAlg
 
   virtual ~TrigBjetHypoAlg(); 
 
-  StatusCode  initialize() override;
-  StatusCode  execute_r( const EventContext& context ) const override;
-  StatusCode  finalize() override;
+  virtual StatusCode  initialize() override;
+  virtual StatusCode  execute_r( const EventContext& context ) const override;
+  virtual StatusCode  finalize() override;
  
  private: 
   TrigBjetHypoAlg();
@@ -43,7 +42,7 @@ class TrigBjetHypoAlg
   // ----->>>>>>>
   SG::ReadHandleKey< TrigRoiDescriptorCollection > m_roisKey;
   SG::ReadHandleKey< xAOD::BTaggingContainer> m_bTagKey;
-  SG::WriteHandleKey< DecisionContainer > m_decisionsKey;
+  SG::WriteHandleKey< TrigCompositeUtils::DecisionContainer > m_decisionsKey;
  
 }; 
 
-- 
GitLab