Repair type initialization problem

dabrahams · dabrahams · commit cf15a99730e6 · 2002-08-08T06:14:48.000Z
[SVN r14736]
diff --git a/src/object/function.cpp b/src/object/function.cpp
@@ -24,7 +24,11 @@ function::function(py_function const& implementation, unsigned min_args, unsigne
     , m_max_args(std::max(max_args,min_args))
 {
     PyObject* p = this;
-    ::PyType_Ready(&function_type);
+    if (function_type.ob_type == 0)
+    {
+        function_type.ob_type = &PyType_Type;
+        ::PyType_Ready(&function_type);
+    }
     PyObject_INIT(p, &function_type);
 }
 
@@ -305,7 +309,7 @@ extern "C"
 }
 
 PyTypeObject function_type = {
-    PyObject_HEAD_INIT(&PyType_Type)
+    PyObject_HEAD_INIT(0)
     0,
     "Boost.Python.function",
     sizeof(function),

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,11 @@ function::function(py_function const& implementation, unsigned min_args, unsigne`
`24`	`24`	`, m_max_args(std::max(max_args,min_args))`
`25`	`25`	`{`
`26`	`26`	`PyObject* p = this;`
`27`		`- ::PyType_Ready(&function_type);`
	`27`	`+ if (function_type.ob_type == 0)`
	`28`	`+ {`
	`29`	`+ function_type.ob_type = &PyType_Type;`
	`30`	`+ ::PyType_Ready(&function_type);`
	`31`	`+ }`
`28`	`32`	`PyObject_INIT(p, &function_type);`
`29`	`33`	`}`
`30`	`34`
`@@ -305,7 +309,7 @@ extern "C"`
`305`	`309`	`}`
`306`	`310`
`307`	`311`	`PyTypeObject function_type = {`
`308`		`- PyObject_HEAD_INIT(&PyType_Type)`
	`312`	`+ PyObject_HEAD_INIT(0)`
`309`	`313`	`0,`
`310`	`314`	`"Boost.Python.function",`
`311`	`315`	`sizeof(function),`