merging current boost/python and libs/python from trunk into release branch

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit e28f0509d813 · 2011-04-05T16:31:51.000Z
[SVN r71002]
diff --git a/src/module.cpp b/src/module.cpp
@@ -38,7 +38,7 @@ BOOST_PYTHON_DECL void scope_setattr_doc(char const* name, object const& x, char
 
 #if PY_VERSION_HEX >= 0x03000000
 
-PyObject* init_module(PyModuleDef& moduledef, void(*init_function)())
+BOOST_PYTHON_DECL PyObject* init_module(PyModuleDef& moduledef, void(*init_function)())
 {
     return init_module_in_scope(
         PyModule_Create(&moduledef),

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ BOOST_PYTHON_DECL void scope_setattr_doc(char const* name, object const& x, char`
`38`	`38`
`39`	`39`	`#if PY_VERSION_HEX >= 0x03000000`
`40`	`40`
`41`		`-PyObject* init_module(PyModuleDef& moduledef, void(*init_function)())`
	`41`	`+BOOST_PYTHON_DECL PyObject* init_module(PyModuleDef& moduledef, void(*init_function)())`
`42`	`42`	`{`
`43`	`43`	`return init_module_in_scope(`
`44`	`44`	`PyModule_Create(&moduledef),`