Utils: (membind) Fix weird casting error when binding base-class members

[senf.git] / Utils / Console / Node.cc

diff --git a/Utils/Console/Node.cc b/Utils/Console/Node.cc
index 39c2685..41c1779 100644 (file)
--- a/Utils/Console/Node.cc
+++ b/Utils/Console/Node.cc
@@ -102,6 +102,14 @@ prefix_ void senf::console::LinkNode::v_help(std::ostream & os)
 ///////////////////////////////////////////////////////////////////////////
 //senf::console::DirectoryNode
 
+prefix_ senf::console::DirectoryNode::~DirectoryNode()
+{
+    ChildMap::iterator i (children_.begin());
+    ChildMap::iterator const i_end (children_.end());
+    for (; i != i_end; ++i)
+        i->second->parent_ = 0;
+}
+
 prefix_ senf::console::GenericNode::ptr
 senf::console::DirectoryNode::remove(std::string const & name)
 {
@@ -209,11 +217,11 @@ prefix_ void senf::console::SimpleCommandNode::v_help(std::ostream & output)
     output << doc_ << "\n";
 }
 
-prefix_ void senf::console::SimpleCommandNode::v_execute(std::ostream & output,
+prefix_ void senf::console::SimpleCommandNode::v_execute(boost::any & rv, std::ostream & os,
                                                          ParseCommandInfo const & command)
     const
 {
-    fn_(output, command);
+    fn_(os, command);
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////