Merge branch 'usingns.BCM_RawDataByteStreamCnv-20201207' into 'master'

BCM_RawDataByteStreamCnv: Fix placement of using declarations.

See merge request atlas/athena!38944

InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h

@@ -15,8 +15,6 @@
 class BCM_RDO_Container;
 class BCM_RodDecoder;
 
-using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
-
 // the tool to decode a ROB fragment
 
 class BCM_RawDataProviderTool : public AthAlgTool

InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h

@@ -27,8 +27,6 @@
 #include "eformat/SourceIdentifier.h"
 #include <atomic>
 
-using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
-
 class BCM_RodDecoder : public AthAlgTool
 {
 

InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ StatusCode BCM_RawDataProvider::execute() {
 
   // ask ROBDataProviderSvc for the vector of ROBFragment for all BCM ROBIDs
   // std::vector<const ROBFragment*> listOfRobf_all;
-  std::vector<const ROBFragment*> listOfRobf;
+  std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> listOfRobf;
   
   // std::vector<unsigned int> ROBIDs_all;
   std::vector<unsigned int> ROBIDs;

InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx

@@ -70,7 +70,7 @@ StatusCode BCM_RawDataProviderTool::convert( std::vector<const OFFLINE_FRAGMENTS
 {
   if(vecRobs.size() == 0) return StatusCode::SUCCESS;
 
-  std::vector<const ROBFragment*>::const_iterator rob_it = vecRobs.begin();
+  std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>::const_iterator rob_it = vecRobs.begin();
 
   // loop over the ROB fragments
   for(; rob_it!=vecRobs.end(); ++rob_it) {