fixes for endemic (compiler?) issues with virtual inheritance of sigc::trackable. NOTE: automation list undo/redo no longer operational, fix to follow

git-svn-id: svn://localhost/ardour2/trunk@1007 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 17 insertions, 20 deletions

diff --git a/libs/pbd/undo.cc b/libs/pbd/undo.cc
index af408a24a4..442a5439f2 100644
--- a/libs/pbd/undo.cc
+++ b/libs/pbd/undo.cc
@@ -24,31 +24,13 @@
 
 #include <pbd/undo.h>
 #include <pbd/xml++.h>
+#include <pbd/shiva.h>
 
 #include <sigc++/bind.h>
 
 using namespace std;
 using namespace sigc;
 
-/* grrr, strict C++ says that static member functions are not C functions, but we also want
-   to be able to pack this into a sigc::ptr_fun and not sigc::mem_fun, so we have to make
-   it a genuine function rather than a member.
-*/
-
-static void command_death (UndoTransaction* ut, Command* c)
-{
-	if (ut->clearing()) {
-		return;
-	}
-
-	ut->remove_command (c);
-
-	if (ut->empty()) {
-		delete ut;
-	}
-}
-
-
 UndoTransaction::UndoTransaction ()
 {
 	_clearing = false;
@@ -68,6 +50,20 @@ UndoTransaction::~UndoTransaction ()
 	clear ();
 }
 
+void 
+command_death (UndoTransaction* ut, Command* c)
+{
+	if (ut->clearing()) {
+		return;
+	}
+
+	ut->remove_command (c);
+
+	if (ut->empty()) {
+		delete ut;
+	}
+}
+
 UndoTransaction& 
 UndoTransaction::operator= (const UndoTransaction& rhs)
 {
@@ -81,7 +77,8 @@ UndoTransaction::operator= (const UndoTransaction& rhs)
 void
 UndoTransaction::add_command (Command *const action)
 {
-	action->GoingAway.connect (bind (sigc::ptr_fun (command_death), this, const_cast<Command*>(action)));
+	/* catch death */
+	new PBD::ProxyShiva<Command,UndoTransaction> (*action, *this, &command_death);
 	actions.push_back (action);
 }