Merge branch 'bytestream_storagetype_muon' into 'master'

MuonByteStream: Remove usage of "extern" ByteStream_StorageType

See merge request atlas/athena!21408

MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/CscRdoContByteStreamCnv.h

 /*
-  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: 

MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MdtCsmContByteStreamCnv.h

 /*
-  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: 

MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/RpcPadContByteStreamCnv.h

 /*
-  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: 

MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/TgcRdoContByteStreamCnv.h

 /*
-  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:

MuonSpectrometer/MuonCnv/MuonByteStream/src/CscRdoContByteStreamCnv.cxx

 /*
-  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() 

MuonSpectrometer/MuonCnv/MuonByteStream/src/MdtCsmContByteStreamCnv.cxx

 /*
-  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");

MuonSpectrometer/MuonCnv/MuonByteStream/src/RpcPadContByteStreamCnv.cxx

 /*
-  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");

MuonSpectrometer/MuonCnv/MuonByteStream/src/TgcRdoContByteStreamCnv.cxx

 /*
-  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()