Removed def_init(...) from class_

djowel · djowel · commit a75ee50533e1 · 2002-09-21T02:50:29.000Z
[SVN r15468]
diff --git a/include/boost/python/class.hpp b/include/boost/python/class.hpp
@@ -102,7 +102,7 @@ template <
     >
 class class_ : public objects::class_base
 {
- private: // types
+ public: // types
    typedef objects::class_base base;
 
     typedef class_<T,X1,X2,X3> self;
@@ -116,12 +116,15 @@ class class_ : public objects::class_base
 
     typedef objects::select_holder<T,held_type> holder_selector;
 
+ private:
+
     typedef typename detail::select_bases<X1
             , typename detail::select_bases<X2
               , typename boost::python::detail::select_bases<X3>::type
               >::type
             >::type bases;
 
+
     // A helper class which will contain an array of id objects to be
     // passed to the base class constructor
     struct id_vector
@@ -223,42 +226,6 @@ class class_ : public objects::class_base
         return this->def(op.name(), &op_t::template apply<T>::execute);
     }
 
-    // Define the constructor with the given Args, which should be an
-    // MPL sequence of types.
-    template <class Args>
-    self& def_init(Args const&)
-    {
-        return this->def("__init__",
-            python::make_constructor<Args>(
-                // Using runtime type selection works around a CWPro7 bug.
-                holder_selector::execute((held_type*)0).get()
-                )
-            );
-    }
-
-    template <class Args, class CallPolicyOrDoc>
-    self& def_init(Args const&, CallPolicyOrDoc const& policy_or_doc, char const* doc = 0)
-    {
-        typedef detail::def_helper<CallPolicyOrDoc> helper;
-
-        return this->def(
-            "__init__",
-            python::make_constructor<Args>(
-                helper::get_policy(policy_or_doc)
-                // Using runtime type selection works around a CWPro7 bug.
-                , holder_selector::execute((held_type*)0).get()
-                )
-            , helper::get_doc(policy_or_doc, doc)
-            );
-    }
-
-    // Define the default constructor.
-    self& def_init()
-    {
-        this->def_init(mpl::list0<>::type());
-        return *this;
-    }
-
     //
     // Data member access
     //
@@ -400,7 +367,7 @@ inline class_<T,X1,X2,X3>::class_(char const* name, char const* doc)
 {
     this->register_();
     detail::force_instantiate(sizeof(detail::assert_default_constructible(T())));
-    this->def_init();
+    this->def(init<>());
     this->set_instance_size(holder_selector::additional_size());
 }
 
diff --git a/include/boost/python/init.hpp b/include/boost/python/init.hpp
@@ -269,7 +269,15 @@ namespace detail
           , mpl::push_front<>
           >::type args;
 
-      cl.def_init(args(), policies, doc);
+      cl.def(
+            "__init__",
+            python::make_constructor<args>(
+                policies
+                // Using runtime type selection works around a CWPro7 bug.
+                , ClassT::holder_selector::execute((ClassT::held_type*)0).get()
+                )
+            , doc
+            );
   }
 
   ///////////////////////////////////////////////////////////////////////////////
