From d24964f86e1108f88d55a9580bbd6d2e482562dd Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 27 Jan 2010 15:11:39 +0100
Subject: Merge the CppOwnedPyObject C++ class into CppPyObject.

---
 python/pkgrecords.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'python/pkgrecords.cc')

diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index d34ba0d2..1e43b2e8 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -157,7 +157,7 @@ static PyObject *PkgRecordsNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
                                    &Owner) == 0)
       return 0;
 
-   return HandleErrors(CppOwnedPyObject_NEW<PkgRecordsStruct>(Owner,type,
+   return HandleErrors(CppPyObject_NEW<PkgRecordsStruct>(Owner,type,
 							      GetCpp<pkgCache *>(Owner)));
 }
 
@@ -165,10 +165,10 @@ PyTypeObject PyPackageRecords_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageRecords",                          // tp_name
-   sizeof(CppOwnedPyObject<PkgRecordsStruct>),   // tp_basicsize
+   sizeof(CppPyObject<PkgRecordsStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<PkgRecordsStruct>,   // tp_dealloc
+   CppDealloc<PkgRecordsStruct>,   // tp_dealloc
    0,                                   // tp_print
    0,                                    // tp_getattr
    0,                                   // tp_setattr
@@ -187,8 +187,8 @@ PyTypeObject PyPackageRecords_Type =
     Py_TPFLAGS_BASETYPE |
     Py_TPFLAGS_HAVE_GC),
    "Records Object",                    // tp_doc
-   CppOwnedTraverse<PkgRecordsStruct>,  // tp_traverse
-   CppOwnedClear<PkgRecordsStruct>,     // tp_clear
+   CppTraverse<PkgRecordsStruct>,  // tp_traverse
+   CppClear<PkgRecordsStruct>,     // tp_clear
    0,                                   // tp_richcompare
    0,                                   // tp_weaklistoffset
    0,                                   // tp_iter
-- 
cgit v1.2.3