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

Borland fix (thanks to Fernando Cacciola)

Browse Source 
[SVN r16331]
This commit is contained in:
Peter Dimov
2002-11-19 18:21:32 +00:00
parent f34866e8a5
commit 4b200e9847
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/shared_ptr.hpp
View File

@@ -83,8 +83,7 @@ template<class T> class shared_ptr
{ {
private: private:
// Borland 5.5.1 specific workarounds // Borland 5.5.1 specific workaround
// typedef checked_deleter<T> deleter;
typedef shared_ptr<T> this_type; typedef shared_ptr<T> this_type;
// enable_shared_from_this support // enable_shared_from_this support
@@ -126,7 +125,19 @@ public:
sp_enable_shared_from_this(p); sp_enable_shared_from_this(p);
} }
// generated copy constructor, assignment, destructor are fine // generated copy constructor, assignment, destructor are fine...
// except on Borland C++ 5.5.1
#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
shared_ptr & operator=(shared_ptr const & r) // never throws
{
px = r.px;
pn = r.pn; // shared_count::op= doesn't throw
return *this;
}
#endif
template<class Y> template<class Y>
explicit shared_ptr(weak_ptr<Y> const & r): px(r.px), pn(r.pn) // may throw explicit shared_ptr(weak_ptr<Y> const & r): px(r.px), pn(r.pn) // may throw