Skip to content
Snippets Groups Projects
Commit dfb47907 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

minor fixes to some interface files

See merge request !44
parents c50c176d dbc4ed93
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
class GAUDI_API IAppMgrUI: virtual public INamedInterface { class GAUDI_API IAppMgrUI: virtual public INamedInterface {
public: public:
/// InterfaceID /// InterfaceID
DeclareInterfaceID(IAppMgrUI,3,0); DeclareInterfaceID(IAppMgrUI,4,0);
/// Run the complete job (from initialize to terminate) /// Run the complete job (from initialize to terminate)
virtual StatusCode run() = 0; virtual StatusCode run() = 0;
/// Configure the job /// Configure the job
......
...@@ -17,12 +17,12 @@ namespace Athena { ...@@ -17,12 +17,12 @@ namespace Athena {
/** @class IClassIDSvc /** @class IClassIDSvc
* @brief interface to the CLID database * @brief interface to the CLID database
* @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration * @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration
*$Id: IClassIDSvc.h,v 1.7 2009-01-15 19:05:54 binet Exp $ *$Id: IClassIDSvc.h,v 1.7 2009-01-15 19:05:54 binet Exp $
*/ */
class IClassIDSvc : virtual public IService { class IClassIDSvc : virtual public IService {
public: public:
/// get next available CLID /// get next available CLID
/// @throws std::runtime_error if no CLID can be allocated /// @throws std::runtime_error if no CLID can be allocated
virtual CLID nextAvailableID() const = 0; virtual CLID nextAvailableID() const = 0;
/// check if id is used /// check if id is used
...@@ -40,21 +40,21 @@ public: ...@@ -40,21 +40,21 @@ public:
/// get type name associated with clID (if any) /// get type name associated with clID (if any)
virtual StatusCode getPackageInfoForID(const CLID& id, Athena::PackageInfo& info) const = 0; virtual StatusCode getPackageInfoForID(const CLID& id, Athena::PackageInfo& info) const = 0;
/// associate type name, package info and type-info name with clID /// associate type name, package info and type-info name with clID
virtual virtual
StatusCode setTypePackageForID(const CLID&, StatusCode setTypePackageForID(const CLID&,
const std::string& typeName, const std::string& typeName,
const Athena::PackageInfo&, const Athena::PackageInfo&,
const std::string& typeInfoName = "") = 0; const std::string& typeInfoName = "") = 0;
/// Gaudi boilerplate /// Gaudi boilerplate
static const InterfaceID& interfaceID(); static const InterfaceID& interfaceID();
/// destructor /// destructor
virtual ~IClassIDSvc(); virtual ~IClassIDSvc();
}; };
//<<<<<< INLINE MEMBER FUNCTIONS >>>>>> //<<<<<< INLINE MEMBER FUNCTIONS >>>>>>
inline inline
const InterfaceID& const InterfaceID&
IClassIDSvc::interfaceID() { IClassIDSvc::interfaceID() {
static const InterfaceID _IID("IClassIDSvc", 1, 0); static const InterfaceID _IID("IClassIDSvc", 1, 0);
return _IID; return _IID;
......
...@@ -83,7 +83,7 @@ namespace Io { ...@@ -83,7 +83,7 @@ namespace Io {
}; };
static std::string IoFlagName(IoFlags f) { static std::string IoFlagName(IoFlags f) {
static const std::map<IoFlag, std::string> s_names = { { static const std::map<IoFlag, std::string> s_names = { {
{ READ, "READ" }, { WRITE, "WRITE"}, { RDWR, "RDWR" }, { READ, "READ" }, { WRITE, "WRITE"}, { RDWR, "RDWR" },
{ CREATE, "CREATE"}, { EXCL, "EXCL" }, { TRUNC, "TRUNC"}, { CREATE, "CREATE"}, { EXCL, "EXCL" }, { TRUNC, "TRUNC"},
{ APPEND, "APPEND"}, { INVALID,"INVALID"} } }; { APPEND, "APPEND"}, { INVALID,"INVALID"} } };
...@@ -157,7 +157,7 @@ namespace Io { ...@@ -157,7 +157,7 @@ namespace Io {
}; };
inline std::ostream & operator << (std::ostream & s, const IoTech &t) { inline std::ostream & operator << (std::ostream & s, const IoTech &t) {
static const std::array<const char*, SQLITE+1> tbl = { static const std::array<const char*, SQLITE+1> tbl = {
"UNKNOWN", "POSIX", "ROOT", "UNKNOWN", "POSIX", "ROOT",
"BS", "HDF5", "SQLITE" }; "BS", "HDF5", "SQLITE" };
return t < tbl.size() ? s << tbl[t] : s; return t < tbl.size() ? s << tbl[t] : s;
...@@ -298,7 +298,7 @@ namespace Io { ...@@ -298,7 +298,7 @@ namespace Io {
}; };
inline std::ostream & operator << (std::ostream & s, const Action &t) { inline std::ostream & operator << (std::ostream & s, const Action &t) {
static const std::array<const char*, INVALID_ACTION+1> tbl = { static const std::array<const char*, INVALID_ACTION+1> tbl = {
"OPEN", "CLOSE", "REOPEN", "OPEN", "CLOSE", "REOPEN",
"OPEN_ERR","CLOSE_ERR", "REOPEN_ERR", "OPEN_ERR","CLOSE_ERR", "REOPEN_ERR",
"INVALID_ACTION" }; "INVALID_ACTION" };
......
...@@ -31,8 +31,8 @@ public: ...@@ -31,8 +31,8 @@ public:
virtual void addListener(IIncidentListener* lis, virtual void addListener(IIncidentListener* lis,
const std::string& type = "", const std::string& type = "",
long priority = 0, long priority = 0,
bool rethrow = false, bool rethrow = false,
bool singleShot = false ) = 0; bool singleShot = false ) = 0;
/** Remove listener /** Remove listener
@param lis Listener address @param lis Listener address
@param type Incident type @param type Incident type
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
//@TODO: return vector by value instead... //@TODO: return vector by value instead...
virtual void getListeners(std::vector<IIncidentListener*>& lis, virtual void getListeners(std::vector<IIncidentListener*>& lis,
const std::string& type = "") const = 0; const std::string& type = "") const = 0;
/** Fire an Incident /** Fire an Incident
@param Incident being fired @param Incident being fired
......
...@@ -101,7 +101,7 @@ public: ...@@ -101,7 +101,7 @@ public:
* @return SmartIF& to the created service. * @return SmartIF& to the created service.
* *
* NOTE: as this returns a &, the underlying implementation * NOTE: as this returns a &, the underlying implementation
* must guarantee that once created, these SmartIF remain * must guarantee that once created, these SmartIF remain
* pinned in their location, thus constraining * pinned in their location, thus constraining
* the underlying implementation (i.e. one cannot use * the underlying implementation (i.e. one cannot use
* something like std::vector<SmartIF<IService>>). * something like std::vector<SmartIF<IService>>).
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment