feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Removed casts as unsafe.

Browse Source 
[SVN r13179]
This commit is contained in:
Peter Dimov
2002-03-12 14:02:38 +00:00
parent c17f8c36c1
commit 72f83165e0
2 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/boost/weak_ptr.hpp
View File

@ -51,29 +51,6 @@ public:
{
}
template<typename Y>
weak_ptr(weak_ptr<Y> const & r, detail::static_cast_tag): px(static_cast<element_type *>(r.px)), pn(r.pn)
{
}
template<typename Y>
weak_ptr(weak_ptr<Y> const & r, detail::dynamic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn)
{
if (px == 0) // need to allocate new counter -- the cast failed
{
pn = detail::weak_count();
}
}
template<typename Y>
weak_ptr(weak_ptr<Y> const & r, detail::polymorphic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn)
{
if (px == 0)
{
throw std::bad_cast();
}
}
template<typename Y>
weak_ptr & operator=(weak_ptr<Y> const & r) // never throws
{
@ -187,27 +164,6 @@ template<class T> shared_ptr<T> make_shared(weak_ptr<T> const & r) // never thro
}
}
template<class T, class U> weak_ptr<T> shared_static_cast(weak_ptr<U> const & r)
{
return weak_ptr<T>(r, detail::static_cast_tag());
}
template<class T, class U> weak_ptr<T> shared_dynamic_cast(weak_ptr<U> const & r)
{
return weak_ptr<T>(r, detail::dynamic_cast_tag());
}
template<typename T, typename U> weak_ptr<T> shared_polymorphic_cast(weak_ptr<U> const & r)
{
return weak_ptr<T>(r, detail::polymorphic_cast_tag());
}
template<typename T, typename U> weak_ptr<T> shared_polymorphic_downcast(weak_ptr<U> const & r)
{
BOOST_ASSERT(dynamic_cast<T *>(r.get()) == r.get());
return shared_static_cast<T>(r);
}
} // namespace boost
#ifdef BOOST_MSVC

2
shared_ptr_test.cpp
View File

@ -244,7 +244,7 @@ int test_main(int, char * [])
test_is_nonzero(boost::make_shared(wp2));
}
weak_ptr<Y> wp3 = shared_dynamic_cast<Y>(wp2);
weak_ptr<Y> wp3 = shared_dynamic_cast<Y>(boost::make_shared(wp2));
BOOST_TEST(wp3.use_count() == 1);
BOOST_TEST(wp3.get() != 0);