From e89bd5e3969e21ba7450c51016928b59df4b6620 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 25 Feb 2019 11:22:22 +0100
Subject: [PATCH] MuonByteStream: Remove usage of "extern"
ByteStream_StorageType
---
.../MuonByteStream/CscRdoContByteStreamCnv.h | 14 ++++++--------
.../MuonByteStream/MdtCsmContByteStreamCnv.h | 16 ++++++----------
.../MuonByteStream/RpcPadContByteStreamCnv.h | 16 ++++++----------
.../MuonByteStream/TgcRdoContByteStreamCnv.h | 15 ++++++---------
.../src/CscRdoContByteStreamCnv.cxx | 8 ++++++--
.../src/MdtCsmContByteStreamCnv.cxx | 7 +++++--
.../src/RpcPadContByteStreamCnv.cxx | 7 +++++--
.../src/TgcRdoContByteStreamCnv.cxx | 8 ++++++--
8 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h
index e869b2ad0e2..c852b3c50bc 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONBYTESTREAM_CSCRDOCONTRAWEVENTCNV_H
@@ -18,8 +18,6 @@ class StoreGateSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
/*
ByteStream Converter between CSC RDO <---> BYTE STREAM
@@ -33,16 +31,16 @@ class CscRdoContByteStreamCnv: public Converter
public:
CscRdoContByteStreamCnv(ISvcLocator* svcloc);
- virtual StatusCode initialize();
- virtual StatusCode createObj(IOpaqueAddress* /*pAddr*/, DataObject*& /*pObj*/){
+ virtual StatusCode initialize() override;
+ virtual StatusCode createObj(IOpaqueAddress* /*pAddr*/, DataObject*& /*pObj*/) override {
return StatusCode::FAILURE;
}
- virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
+ virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr) override;
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() { return ByteStream_StorageType;}
+ virtual long repSvcType() const override { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h
index 041807a881b..1dbb6c9a2ed 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONBYTESTREAM_MDTCSMCONTRAWEVENTCNV_H
@@ -25,10 +25,6 @@ class StoreGateSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-//extern svcType_t ByteStream_StorageType;
-extern long ByteStream_StorageType;
-
class MdtCsmContByteStreamCnv: public Converter {
public:
@@ -36,15 +32,15 @@ class MdtCsmContByteStreamCnv: public Converter {
typedef Muon::IMDT_RDOtoByteStreamTool BYTESTREAMTOOL ;
- virtual StatusCode initialize();
- virtual StatusCode createObj(IOpaqueAddress* /**pAddr*/, DataObject*& /**pObj*/){
+ virtual StatusCode initialize() override;
+ virtual StatusCode createObj(IOpaqueAddress* /**pAddr*/, DataObject*& /**pObj*/) override {
return StatusCode::FAILURE;
}
- virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
+ virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr) override;
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const override { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h
index 9ef2f244014..225c3a6fdaf 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONBYTESTREAM_RPCPADCONTBYTESTREAMCNV_H
@@ -33,9 +33,6 @@ class MsgStream;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class RpcPadContByteStreamCnv: public Converter {
public:
@@ -43,16 +40,15 @@ class RpcPadContByteStreamCnv: public Converter {
typedef Muon::IRPC_RDOtoByteStreamTool BYTESTREAMTOOL ;
- virtual StatusCode initialize();
- virtual StatusCode createObj(IOpaqueAddress* /*pAddr*/, DataObject*& /*pObj*/){
+ virtual StatusCode initialize() override;
+ virtual StatusCode createObj(IOpaqueAddress* /*pAddr*/, DataObject*& /*pObj*/) override {
return StatusCode::FAILURE;
}
- virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
+ virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr) override;
/// Storage type and class ID
- //virtual long repSvcType() const { return ByteStream_StorageType;}
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const override { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h
index d065adcfc4b..a2e2cbc668a 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONBYTESTREAM_TGCRDOCONTRAWEVENTCNV_H
@@ -23,9 +23,6 @@ namespace Muon {
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
/*
ByteStream Converter between TGC bareRDO and BS
@@ -38,17 +35,17 @@ class TgcRdoContByteStreamCnv: public Converter
public:
TgcRdoContByteStreamCnv(ISvcLocator* svcloc);
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
- virtual StatusCode createObj(IOpaqueAddress* /**pAddr*/, DataObject*& /**pObj*/){
+ virtual StatusCode createObj(IOpaqueAddress* /**pAddr*/, DataObject*& /**pObj*/) override {
return StatusCode::FAILURE;
}
- virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
+ virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr) override;
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() {return ByteStream_StorageType;}
+ virtual long repSvcType() const override { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx
index f9906cb0fbf..f5b5d6bf667 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonByteStream/CscRdoContByteStreamCnv.h"
@@ -28,7 +28,7 @@ const std::string const_cnvName = "CscRdoContByteStreamCnv";
// constructor
CscRdoContByteStreamCnv::CscRdoContByteStreamCnv(ISvcLocator* svcloc)
- : Converter(ByteStream_StorageType, classID(), svcloc),
+ : Converter(storageType(), classID(), svcloc),
m_tool("Muon::CscRdoContByteStreamTool"),
m_byteStreamEventAccess("ByteStreamCnvSvc", const_cnvName),
m_storeGate("StoreGateSvc", const_cnvName)
@@ -41,6 +41,10 @@ const CLID& CscRdoContByteStreamCnv::classID()
return ClassID_traits<CscRawDataContainer>::ID();
}
+long CscRdoContByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
// initialize
StatusCode CscRdoContByteStreamCnv::initialize()
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx
index e0361c0a62f..c7c335bbc08 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonByteStream/MdtCsmContByteStreamCnv.h"
@@ -29,7 +29,7 @@
#include <map>
MdtCsmContByteStreamCnv::MdtCsmContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc),
+ Converter(storageType(), classID(),svcloc),
m_tool("Muon::MdtCsmContByteStreamTool"),
m_byteStreamEventAccess("ByteStreamCnvSvc", "MdtCsmContByteStreamCnv"),
m_storeGate("StoreGateSvc", "MdtCsmContByteStreamCnv")
@@ -40,6 +40,9 @@ const CLID& MdtCsmContByteStreamCnv::classID(){
return ClassID_traits<MdtCsmContainer>::ID() ;
}
+long MdtCsmContByteStreamCnv::storageType(){
+ return ByteStreamAddress::storageType();
+}
StatusCode MdtCsmContByteStreamCnv::initialize() {
MsgStream log(msgSvc(), "MdtCsmContByteStreamCnv");
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx
index 12b58e33455..979e3575ebb 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonByteStream/RpcPadContByteStreamCnv.h"
@@ -33,7 +33,7 @@
#include <map>
RpcPadContByteStreamCnv::RpcPadContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc),
+ Converter(storageType(), classID(),svcloc),
m_tool("Muon::RpcPadContByteStreamTool"),
m_byteStreamEventAccess("ByteStreamCnvSvc", "RpcPadContByteStreamCnv"),
m_storeGate("StoreGateSvc", "RpcPadContByteStreamCnv")
@@ -43,6 +43,9 @@ const CLID& RpcPadContByteStreamCnv::classID(){
return ClassID_traits<RpcPadContainer>::ID() ;
}
+long RpcPadContByteStreamCnv::storageType(){
+ return ByteStreamAddress::storageType();
+}
StatusCode RpcPadContByteStreamCnv::initialize() {
MsgStream log(msgSvc(), "RpcPadContByteStreamCnv");
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx
index 50666364ece..f3f4d113651 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonByteStream/TgcRdoContByteStreamCnv.h"
@@ -26,7 +26,7 @@ const std::string const_cnvName = "TgcRdoContByteStreamCnv";
// constructor
TgcRdoContByteStreamCnv::TgcRdoContByteStreamCnv(ISvcLocator* svcloc)
- : Converter(ByteStream_StorageType, classID(), svcloc),
+ : Converter(storageType(), classID(), svcloc),
m_tool("Muon::TgcRdoContByteStreamTool"),
m_byteStreamEventAccess("ByteStreamCnvSvc", const_cnvName),
m_storeGate("StoreGateSvc", const_cnvName)
@@ -39,6 +39,10 @@ const CLID& TgcRdoContByteStreamCnv::classID()
return ClassID_traits<TgcRdoContainer>::ID();
}
+long TgcRdoContByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
// initialize
StatusCode TgcRdoContByteStreamCnv::initialize()
--
GitLab