Merge branch 'origin/master'

This commit is contained in:
mpa 2014-04-02 12:45:43 +04:00
commit 78400bad9c
2 changed files with 4 additions and 4 deletions

View File

@ -48,7 +48,7 @@ namespace MED
//! Construct the class by any specialisation of the class
template<class Y>
SharedPtr(SharedPtr<Y> const & r):
boost::shared_ptr<T>(r,boost::detail::dynamic_cast_tag())
boost::shared_ptr<T>(boost::dynamic_pointer_cast<T,Y>(r))
{}
//! Copy-constructor
@ -56,7 +56,7 @@ namespace MED
SharedPtr&
operator=(SharedPtr<Y> const & r)
{
boost::shared_ptr<T>(r,boost::detail::dynamic_cast_tag()).swap(*this);
SharedPtr<T>(r).swap(*this);
return *this;
}

View File

@ -1002,14 +1002,14 @@ namespace MED
template<class Y>
SharedPtr(SharedPtr<Y> const & r):
boost::shared_ptr<TWrapper>(r,boost::detail::dynamic_cast_tag())
boost::shared_ptr<TWrapper>(boost::dynamic_pointer_cast<TWrapper,Y>(r))
{}
template<class Y>
SharedPtr&
operator=(SharedPtr<Y> const & r)
{
boost::shared_ptr<TWrapper>(r,boost::detail::dynamic_cast_tag()).swap(*this);
SharedPtr<TWrapper>(r).swap(*this);
return *this;
}