Commit 590e950f authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (TrigSerializeCnvSvc-00-00-43)

	* Tagging TrigSerializeCnvSvc-00-00-43.
	* src/TrigSerializeCnvSvc.cxx: Comply with ATLAS naming
	conventions.

2015-06-23  scott snyder  <snyder@bnl.gov>

	* Tagging TrigSerializeCnvSvc-00-00-42.
	* TrigSerializeCnvSvc/TrigSerializeConverter.h: Fix clang warnings.

	* fix bug introduced in xAOD transition. detect version change also
parent a98119b5
################################################################################
# Package: TrigSerializeCnvSvc
################################################################################
# Declare the package name:
atlas_subdir( TrigSerializeCnvSvc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthContainers
Control/AthenaBaseComps
Control/SGTools
Control/StoreGate
GaudiKernel
PRIVATE
Control/AthenaKernel
Control/DataModelRoot
Database/APR/CollectionBase
Database/APR/CollectionUtilities
Database/APR/POOLCore
Database/APR/PersistencySvc
Database/APR/StorageSvc
Database/PersistentDataModel
Trigger/TrigDataAccess/TrigSerializeResult
Trigger/TrigDataAccess/TrigSerializeTP )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( TrigSerializeCnvSvcLib
src/*.cxx
PUBLIC_HEADERS TrigSerializeCnvSvc
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthContainers AthenaBaseComps SGTools GaudiKernel StoreGateLib SGtests TrigSerializeResultLib TrigSerializeTPLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel DataModelRoot CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc PersistentDataModel )
atlas_add_component( TrigSerializeCnvSvc
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaBaseComps SGTools StoreGateLib SGtests GaudiKernel AthenaKernel DataModelRoot CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc PersistentDataModel TrigSerializeResultLib TrigSerializeTPLib TrigSerializeCnvSvcLib )
......@@ -38,8 +38,8 @@ class CnvFactory;
* @author Lukas Heinrich lukas.heinrich@cern.ch
*/
namespace SG{struct AuxElement;}
namespace SG{struct IAuxStore;}
namespace SG{class AuxElement;}
namespace SG{class IAuxStore;}
template<typename T>
......
......@@ -28,8 +28,8 @@ StatusCode TrigSerializeCnvSvc::initialize(){
long int
TrigSerializeCnvSvc::storageType() {
static long _type(0x51);
return _type;
static long type(0x51);
return type;
}
long int TrigSerializeCnvSvc::repSvcType() const {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment