boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-23 05:42:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge Trunk changes to RC_1_29_0

Browse Source 
[SVN r15732]
This commit is contained in:
Dave Abrahams
2002-10-05 12:53:06 +00:00
parent 0462c4d2f4
commit c33ac6b47a
154 changed files with 4121 additions and 9390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/object/class.cpp
View File

@@ -330,7 +330,7 @@ namespace objects
// rest corresponding to its declared bases.
//
inline object
new_class(char const* name, std::size_t num_types, class_id const* const types)
new_class(char const* name, std::size_t num_types, class_id const* const types, char const* doc)
{
assert(num_types >= 1);
@@ -348,7 +348,12 @@ namespace objects
}
// Call the class metatype to create a new class
object result = object(class_metatype())(module_prefix() + name, bases, dict());
dict d;
if (doc != 0)
d["__doc__"] = doc;
object result = object(class_metatype())(module_prefix() + name, bases, d);
assert(PyType_IsSubtype(result.ptr()->ob_type, &PyType_Type));
if (scope().ptr() != Py_None)
@@ -360,7 +365,7 @@ namespace objects
class_base::class_base(
char const* name, std::size_t num_types, class_id const* const types, char const* doc)
: object(new_class(name, num_types, types))
: object(new_class(name, num_types, types, doc))
{
// Insert the new class object in the registry
converter::registration& converters = const_cast<converter::registration&>(
@@ -368,9 +373,6 @@ namespace objects
// Class object is leaked, for now
converters.class_object = (PyTypeObject*)incref(this->ptr());
if (doc)
this->attr("__doc__") = doc;
}
void class_base::set_instance_size(std::size_t instance_size)