X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FNode.cti;h=b7f118bc1fba6f53f672a651e9c8c16859cd2972;hb=0734de7b0f8616d5f2454289d1c686ba1d2c625b;hp=ef80237343ed2a9b3fea5352d347f0f475793f4d;hpb=c70f7413515b513656f850f51a3cc2ea9d776a37;p=senf.git

diff --git a/Console/Node.cti b/Console/Node.cti
index ef80237..b7f118b 100644
--- a/Console/Node.cti
+++ b/Console/Node.cti
@@ -23,7 +23,7 @@
 /** \file
     \brief Node inline template implementation */
 
-//#include "Node.ih"
+#include "Node.ih"
 
 // Custom includes
 
@@ -34,10 +34,10 @@
 // senf::console::NodeCreateTraits<Object>::Creator
 
 template <class Object>
-prefix_ typename senf::console::NodeCreateTraits<Object>::NodeType &
+prefix_ typename senf::console::NodeCreateTraits<Object>::result_type
 senf::console::NodeCreateTraits<Object>::Creator::create(DirectoryNode & node,
                                                          std::string const & name,
-                                                         Object const & ob)
+                                                         Object & ob)
 {
     return senf_console_add_node(node, name, ob, 0);
 }
@@ -56,20 +56,17 @@ prefix_ NodeType & senf::console::DirectoryNode::add(std::string const & name,
 }
 
 template <class Object>
-prefix_ typename senf::console::NodeCreateTraits<Object>::NodeType &
+prefix_ typename senf::console::NodeCreateTraits<Object>::result_type
 senf::console::DirectoryNode::add(std::string const & name, Object const & ob)
 {
-    return NodeCreateTraits<Object>::Creator::create(*this, name, ob);
+    return NodeCreateTraits<Object const>::Creator::create(*this, name, ob);
 }
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::SimpleCommandNode
-
-template <class Function>
-prefix_ senf::console::SimpleCommandNode & senf::console::
-senf_console_add_node(DirectoryNode & node, std::string const & name, Function const & fn, ...)
+template <class Object>
+prefix_ typename senf::console::NodeCreateTraits<Object>::result_type
+senf::console::DirectoryNode::add(std::string const & name, Object & ob)
 {
-    return node.add(name, SimpleCommandNode::create(fn));
+    return NodeCreateTraits<Object>::Creator::create(*this, name, ob);
 }
 
 ///////////////////////////////cti.e///////////////////////////////////////