mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-11-12 00:29:17 +05:00
Merge branch 'origin/master'
This commit is contained in:
commit
78400bad9c
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user