From 26be61f6ac20975c82a0b6e351eee292a3c97cec Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 22 Feb 2019 17:12:45 +0100
Subject: [PATCH] LArByteStream: Remove usage of "extern"
ByteStream_StorageType
---
.../LArAccumulatedCalibDigitContByteStreamCnv.h | 9 +++------
.../LArAccumulatedDigitContByteStreamCnv.h | 9 +++------
.../LArByteStream/LArCalibDigitContByteStreamCnv.h | 9 +++------
.../LArByteStream/LArDigitContByteStreamCnv.h | 9 +++------
.../LArByteStream/LArFebHeaderContByteStreamCnv.h | 9 +++------
.../LArByteStream/LArRawChannelContByteStreamCnv.h | 10 +++-------
.../src/LArAccumulatedCalibDigitContByteStreamCnv.cxx | 4 ++--
.../src/LArAccumulatedDigitContByteStreamCnv.cxx | 4 ++--
.../src/LArCalibDigitContByteStreamCnv.cxx | 4 ++--
.../LArByteStream/src/LArDigitContByteStreamCnv.cxx | 4 ++--
.../src/LArFebHeaderContByteStreamCnv.cxx | 4 ++--
.../src/LArRawChannelContByteStreamCnv.cxx | 4 ++--
12 files changed, 30 insertions(+), 49 deletions(-)
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h
index 56e71cf7386..aeb63e3c538 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- 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 LARBYTESTREAM_LARACCUMULATEDCDIGITCONTRAWEVENTCNV_H
@@ -34,9 +34,6 @@ class ByteStreamCnvSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class LArAccumulatedCalibDigitContByteStreamCnv: public Converter {
public:
@@ -51,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType() { return ByteStreamAddress::storageType(); }
static const CLID& classID();
private:
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h
index 19001569bd2..39cad9f5e7e 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArAccumulatedDigitContByteStreamCnv.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- 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 LARBYTESTREAM_LARACCUMULATEDDIGITCONTRAWEVENTCNV_H
@@ -34,9 +34,6 @@ class ByteStreamCnvSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class LArAccumulatedDigitContByteStreamCnv: public Converter {
public:
@@ -51,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType() { return ByteStreamAddress::storageType(); }
static const CLID& classID();
private:
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h
index 8b49de7edb4..ecf8d3aff47 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArCalibDigitContByteStreamCnv.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- 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 LARBYTESTREAM_LARCALIBDIGITCONTRAWEVENTCNV_H
@@ -34,9 +34,6 @@ class ByteStreamCnvSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class LArCalibDigitContByteStreamCnv: public Converter {
public:
@@ -50,8 +47,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType() { return ByteStreamAddress::storageType(); }
static const CLID& classID();
private:
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h
index d37dd395622..d017f069d55 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArDigitContByteStreamCnv.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- 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 LARBYTESTREAM_LARDIGITCONTRAWEVENTCNV_H
@@ -34,9 +34,6 @@ class ByteStreamCnvSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class LArDigitContByteStreamCnv: public Converter {
public:
@@ -51,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType; }
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType() { return ByteStreamAddress::storageType(); }
static const CLID& classID();
private:
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h
index cc25b02c3f8..92f5e28ac4f 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArFebHeaderContByteStreamCnv.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- 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 LARBYTESTREAM_FEBHEADERCONTRAWEVENTCNV_H
@@ -34,9 +34,6 @@ class ByteStreamCnvSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class LArFebHeaderContByteStreamCnv: public Converter {
public:
LArFebHeaderContByteStreamCnv(ISvcLocator* svcloc);
@@ -48,8 +45,8 @@ class LArFebHeaderContByteStreamCnv: public Converter {
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType() { return ByteStreamAddress::storageType(); }
static const CLID& classID();
private:
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h
index ab2188b6048..96888364465 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawChannelContByteStreamCnv.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- 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 LARBYTESTREAM_LARRAWCHANNELCONTRAWEVENTCNV_H
@@ -13,7 +13,6 @@
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
//#include "LArByteStream/Hid2RESrcID.h"
-#
class DataObject;
class StatusCode;
@@ -29,9 +28,6 @@ class ByteStreamCnvSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class LArRawChannelContByteStreamCnv: public Converter {
public:
@@ -46,8 +42,8 @@ class LArRawChannelContByteStreamCnv: public Converter {
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
/// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType; }
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType() { return ByteStreamAddress::storageType(); }
static const CLID& classID();
private:
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
index ad84f43c8d1..b071138fe85 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedCalibDigitContByteStreamCnv.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 "LArByteStream/LArAccumulatedCalibDigitContByteStreamCnv.h"
@@ -32,7 +32,7 @@
LArAccumulatedCalibDigitContByteStreamCnv::LArAccumulatedCalibDigitContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc),m_log(NULL),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
+ Converter(storageType(), classID(),svcloc),m_log(NULL),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
const CLID& LArAccumulatedCalibDigitContByteStreamCnv::classID(){
return ClassID_traits<LArAccumulatedCalibDigitContainer>::ID() ;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
index db7e42b94fc..562dfa424e0 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArAccumulatedDigitContByteStreamCnv.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 "LArByteStream/LArAccumulatedDigitContByteStreamCnv.h"
@@ -32,7 +32,7 @@
LArAccumulatedDigitContByteStreamCnv::LArAccumulatedDigitContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc),m_log(NULL),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
+ Converter(storageType(), classID(),svcloc),m_log(NULL),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
const CLID& LArAccumulatedDigitContByteStreamCnv::classID(){
return ClassID_traits<LArAccumulatedDigitContainer>::ID() ;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
index 1cd8b3e1817..f86ce40b28a 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArCalibDigitContByteStreamCnv.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 "LArByteStream/LArCalibDigitContByteStreamCnv.h"
@@ -30,7 +30,7 @@
LArCalibDigitContByteStreamCnv::LArCalibDigitContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc),
+ Converter(storageType(), classID(),svcloc),
m_log(NULL),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL) {}
LArCalibDigitContByteStreamCnv::~LArCalibDigitContByteStreamCnv() {
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
index d12e94b5758..804e4d73802 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArDigitContByteStreamCnv.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 "LArByteStream/LArDigitContByteStreamCnv.h"
@@ -33,7 +33,7 @@
LArDigitContByteStreamCnv::LArDigitContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc), m_log(NULL),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
+ Converter(storageType(), classID(),svcloc), m_log(NULL),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
LArDigitContByteStreamCnv::~LArDigitContByteStreamCnv() {
if (m_log)
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
index 911f264ec32..eed4ce7041c 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArFebHeaderContByteStreamCnv.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 "LArByteStream/LArFebHeaderContByteStreamCnv.h"
@@ -33,7 +33,7 @@
LArFebHeaderContByteStreamCnv::LArFebHeaderContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
+ Converter(storageType(), classID(),svcloc),m_tool(NULL),m_ByteStreamEventAccess(NULL),m_rdpSvc(NULL),m_storeGate(NULL){}
const CLID& LArFebHeaderContByteStreamCnv::classID(){
return ClassID_traits<LArFebHeaderContainer>::ID() ;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
index 5686674e5a4..43e4363990b 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelContByteStreamCnv.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 "LArByteStream/LArRawChannelContByteStreamCnv.h"
@@ -34,7 +34,7 @@
LArRawChannelContByteStreamCnv::LArRawChannelContByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc), m_log(NULL),
+ Converter(storageType(), classID(),svcloc), m_log(NULL),
m_tool(NULL),m_ByteStreamEventAccess(0),m_rdpSvc(0),m_storeGate(0),m_contSize(0)
{}
--
GitLab