From 977841a7f383115244b27fdf58a4af6429852ff8 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Fri, 2 Mar 2001 01:48:30 +0000
Subject: [PATCH] Use PyObject_INIT() instead of hand-initializing objects

[SVN r9375]
---
 include/boost/python/detail/base_object.hpp |  6 ++--
 include/boost/python/detail/wrap_python.hpp |  7 +++++
 src/extension_class.cpp                     |  7 +++--
 src/functions.cpp                           | 31 ++++++++++++---------
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/include/boost/python/detail/base_object.hpp b/include/boost/python/detail/base_object.hpp
index f8ed665b..bf0faa7b 100644
--- a/include/boost/python/detail/base_object.hpp
+++ b/include/boost/python/detail/base_object.hpp
@@ -5,6 +5,9 @@
 //
 //  The author gratefully acknowleges the support of Dragon Systems, Inc., in
 //  producing this work.
+//
+// Revision History:
+// Mar 01 01  Use PyObject_INIT() instead of trying to hand-initialize (David Abrahams)
 
 #ifndef BASE_OBJECT_DWA051600_H_
 # define BASE_OBJECT_DWA051600_H_
@@ -46,9 +49,8 @@ base_object<python_type>::base_object(PyTypeObject* type_obj)
     std::
 #endif
 		memset(bp, 0, sizeof(base_python_type));
-    ob_refcnt = 1;
-    ob_type = type_obj;
     Py_INCREF(type_obj);
+    PyObject_INIT(bp, type_obj);
 }
 
 template <class python_type>
diff --git a/include/boost/python/detail/wrap_python.hpp b/include/boost/python/detail/wrap_python.hpp
index eb831b68..9e57c287 100644
--- a/include/boost/python/detail/wrap_python.hpp
+++ b/include/boost/python/detail/wrap_python.hpp
@@ -15,6 +15,9 @@
 //  To use the Python debugging library, #define BOOST_DEBUG_PYTHON on the
 //  compiler command-line.
 
+// Revision History:
+// 01 Mar 01  define PyObject_INIT() for Python 1.x
+
 #ifdef _DEBUG
 # ifndef BOOST_DEBUG_PYTHON
 #  undef _DEBUG // Don't let Python force the debug library just because we're debugging.
@@ -76,3 +79,7 @@ typedef int pid_t;
 # define _DEBUG
 #endif
 
+#if !defined(PY_MAJOR_VERSION) || PY_MAJOR_VERSION < 2
+# define PyObject_INIT(op, typeobj) \
+	( (op)->ob_type = (typeobj), _Py_NewReference((PyObject *)(op)), (op) )
+#endif
diff --git a/src/extension_class.cpp b/src/extension_class.cpp
index c15e538b..47862ec7 100644
--- a/src/extension_class.cpp
+++ b/src/extension_class.cpp
@@ -5,6 +5,9 @@
 //
 //  The author gratefully acknowleges the support of Dragon Systems, Inc., in
 //  producing this work.
+//
+// Revision History:
+// Mar 01 01  Use PyObject_INIT() instead of trying to hand-initialize (David Abrahams)
 
 #include <boost/python/detail/extension_class.hpp>
 #include <cstring>
@@ -446,8 +449,8 @@ operator_dispatcher::operator_dispatcher(const ref& o, const ref& s)
     : m_object(o), m_self(s), m_free_list_link(0)
 
 {
-    ob_refcnt = 1;
-    ob_type = &type_obj;
+    PyObject* self = this;
+    PyObject_INIT(self, &type_obj);
 }
 
 operator_dispatcher* 
diff --git a/src/functions.cpp b/src/functions.cpp
index e166c91c..71b59136 100644
--- a/src/functions.cpp
+++ b/src/functions.cpp
@@ -5,6 +5,9 @@
 //
 //  The author gratefully acknowleges the support of Dragon Systems, Inc., in
 //  producing this work.
+//
+// Revision History:
+// Mar 01 01  Use PyObject_INIT() instead of trying to hand-initialize (David Abrahams)
 
 #include <boost/python/detail/functions.hpp>
 #include <boost/python/detail/types.hpp>
@@ -97,19 +100,6 @@ PyObject* function::call(PyObject* args, PyObject* keywords) const
     return 0;
 }
 
-bound_function* bound_function::create(const ref& target, const ref& fn)
-{
-    bound_function* const result = free_list;
-    if (result == 0)
-        return new bound_function(target, fn);
-    
-    free_list = result->m_free_list_link;
-    result->m_target = target;
-    result->m_unbound_function = fn;
-    Py_INCREF(result);
-    return result;
-}
-
 // The instance class whose obj represents the type of bound_function
 // objects in Python. bound_functions must be GetAttrable so the __doc__
 // attribute of built-in Python functions can be accessed when bound.
@@ -123,6 +113,21 @@ private: // type_object<bound_function> hook override
     void dealloc(bound_function*) const;
 };
 
+bound_function* bound_function::create(const ref& target, const ref& fn)
+{
+    bound_function* const result = free_list;
+    if (result == 0)
+        return new bound_function(target, fn);
+    
+    free_list = result->m_free_list_link;
+    result->m_target = target;
+    result->m_unbound_function = fn;
+
+    PyObject* self = result;
+    PyObject_INIT(self, type_object::instance());
+    return result;
+}
+
 bound_function::bound_function(const ref& target, const ref& fn)
     : python_object(type_object::instance()),
       m_target(target),