Merge branch 'namespace.TrigUpgradeTest-20181201' into 'master'

TrigUpgradeTest: Fix using directive placement.

See merge request atlas/athena!16397

Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx

@@ -10,6 +10,8 @@
 
 #include "GaudiKernel/Property.h"
 
+using namespace TrigCompositeUtils;
+
 namespace HLTTest {
 
   TestRoRSeqFilter::TestRoRSeqFilter( const std::string& name, 

Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.h

@@ -9,7 +9,6 @@
 #include "DecisionHandling/TrigCompositeUtils.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 
-using namespace TrigCompositeUtils;
 namespace HLTTest {
 
   /**
@@ -39,14 +38,15 @@ namespace HLTTest {
     std::vector<std::string> m_outputs;
     
     std::vector<std::string> m_chainsProperty;
-    DecisionIDContainer  m_chains; // this is the set of chains we care about in this filter
+    TrigCompositeUtils::DecisionIDContainer  m_chains; // this is the set of chains we care about in this filter
     bool m_alwaysPass = false; // override decision 
     
     /*
       @brief fills the output with decision objects lining back to the succesfully passing objs
       NB> The positive/negative decision can be red from the output.size()
     */
-    void copyPassing(const std::string& inputKey, DecisionContainer* output) const;
+    void copyPassing(const std::string& inputKey,
+                     TrigCompositeUtils::DecisionContainer* output) const;
   }; 
   
 } //> end namespace HLTTest