diff options
author | Johnathan Corgan | 2012-04-16 16:21:58 -0700 |
---|---|---|
committer | Johnathan Corgan | 2012-04-16 16:21:58 -0700 |
commit | 54f27eed4991daa41ccba37789a250abdab020a9 (patch) | |
tree | 8546aa76d6d2143c9ff54f2750caf4aecd5ebdf2 /gruel/src/lib/pmt/pmt.cc | |
parent | e53e231e50b66f9ab9a1ab5a3c7da894736be000 (diff) | |
download | gnuradio-54f27eed4991daa41ccba37789a250abdab020a9.tar.gz gnuradio-54f27eed4991daa41ccba37789a250abdab020a9.tar.bz2 gnuradio-54f27eed4991daa41ccba37789a250abdab020a9.zip |
Revert "Merge remote branch 'jblum-github/pmt_set_deleter'"
This reverts commit f88b8cf5508d3ba446cb94f800c56d34279cf91e, reversing
changes made to a87ac60f15c2593ececb02ba16ab842c20e760d2.
Diffstat (limited to 'gruel/src/lib/pmt/pmt.cc')
-rw-r--r-- | gruel/src/lib/pmt/pmt.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gruel/src/lib/pmt/pmt.cc b/gruel/src/lib/pmt/pmt.cc index 57b66b1a4..f9cf6b4bf 100644 --- a/gruel/src/lib/pmt/pmt.cc +++ b/gruel/src/lib/pmt/pmt.cc @@ -58,7 +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 ) p->deleter_(p); } +void intrusive_ptr_release(pmt_base* p) { if (--(p->count_) == 0 ) delete p; } pmt_base::~pmt_base() { @@ -1383,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 */ |