Skip to content
Snippets Groups Projects
Commit 187dcee4 authored by nobody's avatar nobody
Browse files

This commit was manufactured by cvs2svn to create tag

'tdaq-01-04-00_patches_01'.
parent 6b46e0ff
No related branches found
No related merge requests found
......@@ -579,6 +579,10 @@ class Configuration {
template<class TARGET, class SOURCE> const TARGET *cast(const SOURCE *s);
// temporary method to solve casting of objects with the same UID
// to be used only in DVS
template<class TARGET, class SOURCE> const TARGET *cast2(const SOURCE *s);
// database manipulations
......@@ -1070,12 +1074,19 @@ Configuration::referenced_by(const T& obj, const std::string& relationship_name,
template<class TARGET, class SOURCE> const TARGET *
Configuration::cast(const SOURCE *s)
{
return get<TARGET>(s->UID());
}
// temporary method to solve casting of objects with the same UID
// to be used only in DVS
template<class TARGET, class SOURCE> const TARGET *
Configuration::cast2(const SOURCE *s)
{
const TARGET * o = get<TARGET>(s->UID());
return ((o && o->class_name() == s->class_name()) ? o : 0);
}
template<class T>
Configuration::Cache<T>::~Cache()
{
......
......@@ -52,7 +52,7 @@ Configuration::Configuration(const std::string& spec) : m_impl(0), m_shlib_h(0)
// load plug-in
m_shlib_h = dlopen (plugin_name.c_str(), RTLD_GLOBAL);
m_shlib_h = dlopen (plugin_name.c_str(), RTLD_LAZY);
if(!m_shlib_h) {
std::cerr
......
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