diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-16 16:29:36 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-16 16:29:36 -0700 |
| commit | ca7903db3bae8c0b167c39e0e78021724b7be4b3 (patch) | |
| tree | 0fd3e83118fb583ddffdc257acda5b7fb0c73924 /gruel/src/lib/pmt/pmt.cc | |
| parent | 85bc95b0f6d95ab78db229df1d3c2b74c632aff4 (diff) | |
| parent | 54f27eed4991daa41ccba37789a250abdab020a9 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gruel/src/lib/pmt/pmt.cc')
| -rw-r--r-- | gruel/src/lib/pmt/pmt.cc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/gruel/src/lib/pmt/pmt.cc b/gruel/src/lib/pmt/pmt.cc index 9b1e14e751..1d9125d4e0 100644 --- a/gruel/src/lib/pmt/pmt.cc +++ b/gruel/src/lib/pmt/pmt.cc @@ -58,13 +58,7 @@ pmt_base::operator delete(void *p, size_t size) #endif void intrusive_ptr_add_ref(pmt_base* p) { ++(p->count_); } -void intrusive_ptr_release(pmt_base* p) { - if (--(p->count_) == 0 ){ - //make a copy of deleter before we delete its container, p - boost::function<void(pmt_base *)> deleter = p->deleter_; - deleter(p); - } -} +void intrusive_ptr_release(pmt_base* p) { if (--(p->count_) == 0 ) delete p; } pmt_base::~pmt_base() { @@ -1389,16 +1383,4 @@ pmt_dump_sizeof() printf("sizeof(pmt_uniform_vector) = %3zd\n", sizeof(pmt_uniform_vector)); } -/* - * ------------------------------------------------------------------------ - * advanced - * ------------------------------------------------------------------------ - */ - -void -pmt_set_deleter(pmt_t obj, boost::function<void(pmt_base *)> &deleter) -{ - obj->deleter_ = (deleter)? deleter : &pmt_base::default_deleter; -} - } /* namespace pmt */ |