From e53e231e50b66f9ab9a1ab5a3c7da894736be000 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Mon, 16 Apr 2012 16:20:29 -0700
Subject: Revert "Merge branch 'test/fix-pmt-deleter' into maint"

This reverts commit 04e2ebb979942cada74f10ea022342716c6851bf, reversing
changes made to 25d687550a0322ffaf270f25faf2b4a78a97142c.
---
 gruel/src/lib/pmt/pmt.cc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'gruel/src/lib/pmt/pmt.cc')

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()
 {
-- 
cgit