diff options
| author | Johnathan Corgan | 2012-04-16 16:20:29 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-16 16:20:29 -0700 |
| commit | e53e231e50b66f9ab9a1ab5a3c7da894736be000 (patch) | |
| tree | 99157187fd1457842e64385c4f33e5008c74f590 | |
| parent | 92db96430685e843443a00936328b3539354c83e (diff) | |
| download | gnuradio-e53e231e50b66f9ab9a1ab5a3c7da894736be000.tar.gz gnuradio-e53e231e50b66f9ab9a1ab5a3c7da894736be000.tar.bz2 gnuradio-e53e231e50b66f9ab9a1ab5a3c7da894736be000.zip | |
Revert "Merge branch 'test/fix-pmt-deleter' into maint"
This reverts commit 04e2ebb979942cada74f10ea022342716c6851bf, reversing
changes made to 25d687550a0322ffaf270f25faf2b4a78a97142c.
| -rw-r--r-- | gruel/src/lib/pmt/pmt.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gruel/src/lib/pmt/pmt.cc b/gruel/src/lib/pmt/pmt.cc index c100611be..57b66b1a4 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 ) p->deleter_(p); } pmt_base::~pmt_base() { |