F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 1094: Object::GetObject upon dlopen

Browse Source
This commit is contained in:
Mathieu Lacage
2011-04-05 21:39:39 +02:00
parent b56006e6b0
commit 56268cc4c9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/model/object.h
View File

@@ -388,15 +388,18 @@ template <typename T>
Ptr<T>
Object::GetObject () const
{
// This is an optimization: if the cast works (which is likely),
// things will be pretty fast.
T *result = dynamic_cast<T *> (m_aggregates->buffer[0]);
if (result != 0)
{
return Ptr<T> (result);
}
// if the cast does not work, we try to do a full type check.
Ptr<Object> found = DoGetObject (T::GetTypeId ());
if (found != 0)
{
return Ptr<T> (dynamic_cast<T *> (PeekPointer (found)));
return Ptr<T> (static_cast<T *> (PeekPointer (found)));
}
return 0;
}
@@ -408,7 +411,7 @@ Object::GetObject (TypeId tid) const
Ptr<Object> found = DoGetObject (tid);
if (found != 0)
{
return Ptr<T> (dynamic_cast<T *> (PeekPointer (found)));
return Ptr<T> (static_cast<T *> (PeekPointer (found)));
}
return 0;
}