fix for last commit; grmpf.

[senf.git] / senf / Utils / Console / Variables.ih

diff --git a/senf/Utils/Console/Variables.ih b/senf/Utils/Console/Variables.ih
index 23a5074..3e3f2f5 100644 (file)
--- a/senf/Utils/Console/Variables.ih
+++ b/senf/Utils/Console/Variables.ih
@@ -48,10 +48,13 @@ namespace detail {
         typedef Variable const & Signature ();
         typedef boost::function<Signature> Function;
         typedef detail::ParsedCommandTraits<Signature> Traits;
+        typedef detail::CreateParsedCommandOverload<Traits> CreateOverload;
         typedef Variable const & result_type;
 
         QueryVariable(Variable const & var);
 
+        static typename Traits::Overload::ptr create(Variable const & var);
+
         Variable const & operator()()  const;
 
         Variable const & var_;
@@ -63,10 +66,13 @@ namespace detail {
         typedef void Signature (Variable &);
         typedef boost::function<Signature> Function;
         typedef detail::ParsedCommandTraits<Signature> Traits;
+        typedef detail::CreateParsedCommandOverload<Traits> CreateOverload;
         typedef boost::function<void (Variable const &)> OnChangeHandler;
         typedef void result_type;
         
         SetVariable(Variable & var, OnChangeHandler handler = OnChangeHandler());
+
+        static typename Traits::Overload::ptr create(Variable & var);
         
         void operator()(Variable const & value) const;
 
@@ -74,22 +80,6 @@ namespace detail {
         OnChangeHandler handler_;
     };
 
-    template <class Variable, bool isConst=boost::is_const<Variable>::value>
-    struct VariableNodeCreator
-    {
-        typedef VariableAttributor<Variable> result_type;
-        static VariableAttributor<Variable> add(DirectoryNode & node, std::string const & name,
-                                                Variable & var);
-    };
-
-    template <class Variable>
-    struct VariableNodeCreator<Variable, true>
-    {
-        typedef ConstVariableAttributor<Variable> result_type;
-        static ConstVariableAttributor<Variable> add(DirectoryNode & node, std::string const & name,
-                                                     Variable const & var);
-    };
-
 #endif
 
 }}}