2
0
mirror of https://github.com/boostorg/python.git synced 2026-01-24 06:02:14 +00:00

boost/python, libs/python: all changes from trunk merged into branches/release

[SVN r56806]
This commit is contained in:
Ralf W. Grosse-Kunstleve
2009-10-13 22:37:59 +00:00
parent 46be73387c
commit 89100353db
52 changed files with 720 additions and 245 deletions

View File

@@ -24,11 +24,25 @@ namespace
PyMethodDef initial_methods[] = { { 0, 0, 0, 0 } };
}
BOOST_PYTHON_DECL void init_module(char const* name, void(*init_function)())
BOOST_PYTHON_DECL PyObject* init_module(char const* name, void(*init_function)())
{
#if PY_VERSION_HEX >= 0x03000000
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
name,
0, /* m_doc */
-1, /* m_size */
initial_methods,
0, /* m_reload */
0, /* m_traverse */
0, /* m_clear */
0, /* m_free */
};
PyObject* m = PyModule_Create(&moduledef);
#else
PyObject* m
= Py_InitModule(const_cast<char*>(name), initial_methods);
#endif
if (m != 0)
{
@@ -38,6 +52,7 @@ BOOST_PYTHON_DECL void init_module(char const* name, void(*init_function)())
handle_exception(init_function);
}
return m;
}
}}} // namespace boost::python::detail