Keyword argument support tweak

dabrahams · dabrahams · commit 94063f786238 · 2002-09-29T03:25:04.000Z
[SVN r15544]
diff --git a/include/boost/python/init.hpp b/include/boost/python/init.hpp
@@ -217,8 +217,8 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >
     }
 
     template <class Keywords>
-    init(Keywords const& kw)
-        : base(0, kw.range())
+    init(Keywords const& kw, char const* doc_ = 0)
+        : base(doc_, kw.range())
     {
         typedef typename detail::error::more_keywords_than_init_arguments<
             Keywords::size, n_arguments
@@ -294,18 +294,6 @@ class init<> : public init_base<init<> >
     {
     }
     
-    template <class Keywords>
-    init(char const* doc_, Keywords const& kw)
-        : base(doc_, std::make_pair(kw.base(), kw.base() + Keywords::size))
-    {
-    }
-
-    template <class Keywords>
-    init(Keywords const& kw)
-        : base(0, std::make_pair(kw.base(), kw.base() + Keywords::size))
-    {
-    }
-
     template <class CallPoliciesT>
     init_with_call_policies<CallPoliciesT, self_t>
     operator[](CallPoliciesT const& policies) const
diff --git a/test/args.cpp b/test/args.cpp
@@ -54,7 +54,7 @@ BOOST_PYTHON_MODULE_INIT(args_ext)
     def("f2", f, f_overloads(args("x", "y", "z")));
     def("f3", f, f_overloads(args("x", "y", "z"), "f3's docstring"));
     
-    class_<Y>("Y", init<int>())
+    class_<Y>("Y", init<int>(args("value"), "Y's docstring"))
         .def("value", &Y::value)
         ;
             

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ BOOST_PYTHON_MODULE_INIT(args_ext)`
`54`	`54`	`def("f2", f, f_overloads(args("x", "y", "z")));`
`55`	`55`	`def("f3", f, f_overloads(args("x", "y", "z"), "f3's docstring"));`
`56`	`56`
`57`		`- class_<Y>("Y", init<int>())`
	`57`	`+ class_<Y>("Y", init<int>(args("value"), "Y's docstring"))`
`58`	`58`	`.def("value", &Y::value)`
`59`	`59`	`;`
`60`	`60`