Merge branch 'namespace.TrigBjetHypo-20170903' into 'master'

TrigBjetHypo: Using directive placement.

See merge request !4401

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 ),

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;
  
 };