steven/TinySTL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
邹晓航
2015-03-16 15:09:41 +08:00
parent 525308f2dd
commit 2337187e8a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
TinySTL/Memory.h
View File

@@ -107,20 +107,22 @@ namespace TinySTL{
class shared_ptr{ class shared_ptr{
public: public:
typedef T element_type; typedef T element_type;
private:
template<class Type>
using ref_t = Detail::ref_t < Type >;
public: public:
explicit shared_ptr(T *p = nullptr) :ref_(new ref_t<T>(p)){} explicit shared_ptr(T *p = nullptr) :ref_(new ref_t<T>(p)){}
template<class D> template<class D>
shared_ptr(T *p, D del) : ref_(new ref_t<T>(p, del)){} shared_ptr(T *p, D del) : ref_(new ref_t<T>(p, del)){}
shared_ptr(const shared_ptr& sp){ shared_ptr(const shared_ptr& sp){
ref_ = sp.ref_; copy_ref(sp.ref_);
++(*ref_);
} }
shared_ptr& operator = (const shared_ptr& sp){ shared_ptr& operator = (const shared_ptr& sp){
if (this != &sp){ if (this != &sp){
decrease_ref(); decrease_ref();
ref_ = sp.ref_; copy_ref(sp.ref_);
} }
return *this; return *this;
} }
@@ -136,16 +138,17 @@ namespace TinySTL{
operator bool() const{ return get() != nullptr; } operator bool() const{ return get() != nullptr; }
private: private:
void decrease_ref(){ void decrease_ref(){
if (ref_){ if (ref_->get_data()){
--(*ref_); --(*ref_);
if (use_count() == 0) if (use_count() == 0)
delete ref_; delete ref_;
} }
} }
void copy_ref(ref_t<T> *r){//<2F><>ȷ<EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>ref_t
ref_ = r;
++(*ref_);
}
private: private:
template<class Type>
using ref_t = Detail::ref_t < Type > ;
ref_t<T> *ref_; ref_t<T> *ref_;
}; };
template<class T1, class T2> template<class T1, class T2>