From f235a21464cbea44c63140f97838f4e07f3cc61c Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Mon, 2 Nov 2020 14:22:50 -0500
Subject: [PATCH] BCM_RawDataByteStreamCnv: Fix placement of using
declarations.
Do not put a using declaration in the global namespace in headers.
---
.../BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h | 2 --
.../BCM_RawDataByteStreamCnv/BCM_RodDecoder.h | 2 --
.../BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx | 4 ++--
.../BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx | 2 +-
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h
index 0737c57736b..f51771ddbe8 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h
+++ b/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
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h
index 902917593a9..c603efde4c0 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RodDecoder.h
+++ b/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
{
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx
index b0a77102748..bd9356a2d15 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx
@@ -1,5 +1,5 @@
/*
- 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;
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx
index b76155c1637..210c06ea229 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx
+++ b/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) {
--
GitLab