Commit 5253f60c authored by Charles Leggett's avatar Charles Leggett Committed by Vakhtang Tsulaia
Browse files

update Gaudi to v34r0.003

parent a30a8384
......@@ -19,7 +19,7 @@
//<<<<<< INCLUDES >>>>>>
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/WriteHandleKey.h"
#include "DBDataModel/CollectionMetadata.h"
......
......@@ -12,7 +12,7 @@
#include "EventTagReader.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
#include "CoralBase/AttributeListSpecification.h"
......
......@@ -8,7 +8,7 @@
#define ATLASHISTORY_TESTGAUDIPROPERTY_H
//#include "GaudiKernel/HistoryObj.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include <string>
#include <vector>
......@@ -27,17 +27,17 @@ class TestGaudiProperty {
public:
//typedef std::vector< std::pair<std::string,const Property*> > PropertyList;
//typedef std::vector< const Property* > PropertyList;
//typedef const Property* PropertyList;
//typedef std::vector< std::pair<std::string,const Gaudi::Details::PropertyBase*> > PropertyList;
//typedef std::vector< const Gaudi::Details::PropertyBase* > PropertyList;
//typedef const Gaudi::Details::PropertyBase* PropertyList;
private: // data
//PropertyList m_props;
//Property m_p1;
Property* m_pptr;
const Property* m_cptr;
std::vector<Property*> m_ncprops;
Gaudi::Details::PropertyBase* m_pptr;
const Gaudi::Details::PropertyBase* m_cptr;
std::vector<Gaudi::Details::PropertyBase*> m_ncprops;
public: // functions
......@@ -47,11 +47,11 @@ public: // functions
// Destructor.
~TestGaudiProperty();
//void addProperty( const std::string&, const Property* );
//void addProperty( const Property* );
//void addProperty( const std::string&, const Gaudi::Details::PropertyBase* );
//void addProperty( const Gaudi::Details::PropertyBase* );
//const PropertyList& properties() const { return m_props; }
const Property* property() const { return m_cptr; }
const Gaudi::Details::PropertyBase* property() const { return m_cptr; }
private:
......
......@@ -17,7 +17,7 @@
///////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/System.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "AthenaPoolTestData/TestGaudiProperty.h"
#include <cstdlib>
......@@ -47,11 +47,11 @@ TestGaudiProperty::~TestGaudiProperty() {
}
/*
void
//TestGaudiProperty::addProperty(const std::string& client, const Property* prop) {
TestGaudiProperty::addProperty(const Property* prop) {
//TestGaudiProperty::addProperty(const std::string& client, const Gaudi::Details::PropertyBase* prop) {
TestGaudiProperty::addProperty(const Gaudi::Details::PropertyBase* prop) {
// if (m_props.find(prop) == m_props.end()) {
//m_props.push_back( prop);
//m_ncprops.push_back( const_cast<Property*>(prop));
//m_ncprops.push_back( const_cast<Gaudi::Details::PropertyBase*>(prop));
//m_p1 = *prop;
//m_pptr = m_ncprops[0];
m_cptr = prop;
......
......@@ -22,7 +22,7 @@
#include "AthenaKernel/errorcheck.h"
#include "CxxUtils/Array.h"
#include "AthenaKernel/getMessageSvc.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/IToolSvc.h"
......@@ -771,10 +771,10 @@ CaloRunClusterCorrections::orderCorrections ATLAS_NOT_THREAD_SAFE (bool allowMis
// Tool is being initialized from JO. Find the order property from JOS.
tool.order = -1;
std::string fullname = this->name() + "." + tool.name;
const std::vector<const Property*>* props =
const std::vector<const Gaudi::Details::PropertyBase*>* props =
m_jos->getProperties (fullname);
for (size_t iprop = 0; iprop < props->size(); iprop++) {
const Property& prop = *(*props)[iprop];
const Gaudi::Details::PropertyBase& prop = *(*props)[iprop];
if (prop.name() == "order") {
tool.order = std::atoi (prop.toString().c_str());
break;
......
#include "MyAnalysis/CreateHits.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
......
......@@ -3,7 +3,7 @@
*/
#include "CaloTests/Analysis.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
......
......@@ -3,7 +3,7 @@
*/
#include "CaloTests/AnalysisCal.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
......
......@@ -264,7 +264,7 @@ public:
*
* This version is used by Gaudi as of v19.
*/
virtual StatusCode setProperty (const Property& p);
virtual StatusCode setProperty (const Gaudi::Details::PropertyBase& p);
private:
......
......@@ -18,7 +18,7 @@ PURPOSE: Apply necessary finalising operation to CaloCellContainer
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
......
......@@ -3,7 +3,7 @@
*/
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IToolSvc.h"
......
......@@ -3,7 +3,7 @@
*/
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IToolSvc.h"
......
......@@ -374,7 +374,7 @@ ToolWithConstantsMixin::setProperty (const std::string& propname,
* This version is used by Gaudi as of v19.
*/
StatusCode
ToolWithConstantsMixin::setProperty (const Property& p)
ToolWithConstantsMixin::setProperty (const Gaudi::Details::PropertyBase& p)
{
return CaloRec::ToolWithConstantsMixin::setProperty (p.name(), p.toString());
}
......
......@@ -10,7 +10,7 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
......
......@@ -10,7 +10,7 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
......
......@@ -8,7 +8,7 @@
#include <fstream>
#include <iostream>
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "LArIdentifier/LArIdManager.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArIdentifier/LArOnlID_Exception.h"
......
......@@ -26,7 +26,7 @@
#include "StoreGate/ReadCondHandle.h"
#include "AthenaKernel/errorcheck.h"
#include "CxxUtils/concepts.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include <string>
#include <sstream>
#include <type_traits>
......
......@@ -7,7 +7,7 @@
#include "GaudiKernel/AlgTool.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/IChronoStatSvc.h"
......
......@@ -6,7 +6,7 @@
#include "CLHEP/Units/SystemOfUnits.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/IChronoStatSvc.h"
......
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