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

Made shared_ptr::share_ptr(Y * p) a member template.

Browse Source 
[SVN r13551]
This commit is contained in:
Peter Dimov
2002-04-23 14:56:42 +00:00
parent 110c0021e2
commit 11eacab70e
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/shared_ptr.hpp
View File

@ -75,7 +75,7 @@ template<typename T> class shared_ptr
private:
// Borland 5.5.1 specific workarounds
typedef checked_deleter<T> deleter;
// typedef checked_deleter<T> deleter;
typedef shared_ptr<T> this_type;
public:
@ -86,7 +86,8 @@ public:
{
}
explicit shared_ptr(T * p): px(p), pn(p, deleter()) // requires complete type
template<typename Y>
explicit shared_ptr(Y * p): px(p), pn(p, checked_deleter<Y>()) // Y must be complete
{
}
@ -96,13 +97,14 @@ public:
// shared_ptr will release p by calling d(p)
//
template<typename D> shared_ptr(T * p, D d): px(p), pn(p, d)
template<typename Y, typename D> shared_ptr(Y * p, D d): px(p), pn(p, d)
{
}
// generated copy constructor, assignment, destructor are fine
explicit shared_ptr(weak_ptr<T> const & r): px(r.px), pn(r.pn) // may throw
template<typename Y>
explicit shared_ptr(weak_ptr<Y> const & r): px(r.px), pn(r.pn) // may throw
{
}
@ -176,13 +178,13 @@ public:
this_type().swap(*this);
}
void reset(T * p) // requires complete type
template<typename Y> void reset(Y * p) // Y must be complete
{
BOOST_ASSERT(p == 0 || p != px); // catch self-reset errors
this_type(p).swap(*this);
}
template<typename D> void reset(T * p, D d)
template<typename Y, typename D> void reset(Y * p, D d)
{
this_type(p, d).swap(*this);
}

2
shared_ptr_mt_test.cpp
View File

@ -1,4 +1,4 @@
#if defined(_MSC_VER) && !defined(__ICL)
#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__)
#pragma warning(disable: 4786) // identifier truncated in debug info
#pragma warning(disable: 4710) // function not inlined
#pragma warning(disable: 4711) // function selected for automatic inline expansion

2
shared_ptr_test.cpp
View File

@ -1,4 +1,4 @@
#if defined(_MSC_VER) && !defined(__ICL)
#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__)
#pragma warning(disable: 4786) // identifier truncated in debug info
#pragma warning(disable: 4710) // function not inlined
#pragma warning(disable: 4711) // function selected for automatic inline expansion

2
shared_ptr_timing_test.cpp
View File

@ -1,4 +1,4 @@
#if defined(_MSC_VER) && !defined(__ICL)
#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__)
#pragma warning(disable: 4786) // identifier truncated in debug info
#pragma warning(disable: 4710) // function not inlined
#pragma warning(disable: 4711) // function selected for automatic inline expansion