|
 |
b98e6f |
--- boost_1_73_0/boost/parameter/python.hpp% 2020-11-13 23:37:19.232520985 +0000
|
|
|
b98e6f |
+++ boost_1_73_0/boost/parameter/python.hpp 2020-11-13 23:40:58.808393161 +0000
|
|
|
b98e6f |
@@ -66,7 +66,7 @@
|
|
|
b98e6f |
|
|
|
b98e6f |
if (Py_TYPE(&unspecified) == 0)
|
|
|
b98e6f |
{
|
|
|
b98e6f |
- Py_TYPE(&unspecified) = &PyType_Type;
|
|
|
b98e6f |
+ Py_SET_TYPE(&unspecified, &PyType_Type);
|
|
|
b98e6f |
PyType_Ready(&unspecified);
|
|
|
b98e6f |
}
|
|
|
b98e6f |
|
|
|
b98e6f |
--- boost_1_73_0/libs/python/src/object/class.cpp~ 2020-11-13 23:37:19.236520983 +0000
|
|
|
b98e6f |
+++ boost_1_73_0/libs/python/src/object/class.cpp 2020-11-13 23:40:40.233403979 +0000
|
|
|
b98e6f |
@@ -208,7 +208,7 @@
|
|
|
b98e6f |
{
|
|
|
b98e6f |
if (static_data_object.tp_dict == 0)
|
|
|
b98e6f |
{
|
|
|
b98e6f |
- Py_TYPE(&static_data_object) = &PyType_Type;
|
|
|
b98e6f |
+ Py_SET_TYPE(&static_data_object, &PyType_Type);
|
|
|
b98e6f |
static_data_object.tp_base = &PyProperty_Type;
|
|
|
b98e6f |
if (PyType_Ready(&static_data_object))
|
|
|
b98e6f |
return 0;
|
|
|
b98e6f |
@@ -316,7 +316,7 @@
|
|
|
b98e6f |
{
|
|
|
b98e6f |
if (class_metatype_object.tp_dict == 0)
|
|
|
b98e6f |
{
|
|
|
b98e6f |
- Py_TYPE(&class_metatype_object) = &PyType_Type;
|
|
|
b98e6f |
+ Py_SET_TYPE(&class_metatype_object, &PyType_Type);
|
|
|
b98e6f |
class_metatype_object.tp_base = &PyType_Type;
|
|
|
b98e6f |
if (PyType_Ready(&class_metatype_object))
|
|
|
b98e6f |
return type_handle();
|
|
|
b98e6f |
@@ -375,11 +375,11 @@
|
|
|
b98e6f |
// there. A negative number indicates that the extra
|
|
|
b98e6f |
// instance memory is not yet allocated to any holders.
|
|
|
b98e6f |
#if PY_VERSION_HEX >= 0x02060000
|
|
|
b98e6f |
- Py_SIZE(result) =
|
|
|
b98e6f |
+ Py_SET_SIZE(result,
|
|
|
b98e6f |
#else
|
|
|
b98e6f |
- result->ob_size =
|
|
|
b98e6f |
+ result->ob_size = (
|
|
|
b98e6f |
#endif
|
|
|
b98e6f |
- -(static_cast<int>(offsetof(instance<>,storage) + instance_size));
|
|
|
b98e6f |
+ -(static_cast<int>(offsetof(instance<>,storage) + instance_size)));
|
|
|
b98e6f |
}
|
|
|
b98e6f |
return (PyObject*)result;
|
|
|
b98e6f |
}
|
|
|
b98e6f |
@@ -470,7 +470,7 @@
|
|
|
b98e6f |
{
|
|
|
b98e6f |
if (class_type_object.tp_dict == 0)
|
|
|
b98e6f |
{
|
|
|
b98e6f |
- Py_TYPE(&class_type_object) = incref(class_metatype().get());
|
|
|
b98e6f |
+ Py_SET_TYPE(&class_type_object, incref(class_metatype().get()));
|
|
|
b98e6f |
class_type_object.tp_base = &PyBaseObject_Type;
|
|
|
b98e6f |
if (PyType_Ready(&class_type_object))
|
|
|
b98e6f |
return type_handle();
|
|
|
b98e6f |
@@ -739,7 +739,7 @@
|
|
|
b98e6f |
assert(holder_offset >= offsetof(objects::instance<>,storage));
|
|
|
b98e6f |
|
|
|
b98e6f |
// Record the fact that the storage is occupied, noting where it starts
|
|
|
b98e6f |
- Py_SIZE(self) = holder_offset;
|
|
|
b98e6f |
+ Py_SET_SIZE(self, holder_offset);
|
|
|
b98e6f |
return (char*)self + holder_offset;
|
|
|
b98e6f |
}
|
|
|
b98e6f |
else
|
|
|
b98e6f |
--- boost_1_73_0/libs/python/src/object/life_support.cpp~ 2020-11-13 23:37:19.240520980 +0000
|
|
|
b98e6f |
+++ boost_1_73_0/libs/python/src/object/life_support.cpp 2020-11-13 23:39:37.492440504 +0000
|
|
|
b98e6f |
@@ -93,7 +93,7 @@
|
|
|
b98e6f |
|
|
|
b98e6f |
if (Py_TYPE(&life_support_type) == 0)
|
|
|
b98e6f |
{
|
|
|
b98e6f |
- Py_TYPE(&life_support_type) = &PyType_Type;
|
|
|
b98e6f |
+ Py_SET_TYPE(&life_support_type, &PyType_Type);
|
|
|
b98e6f |
PyType_Ready(&life_support_type);
|
|
|
b98e6f |
}
|
|
|
b98e6f |
|
|
|
b98e6f |
--- boost_1_73_0/libs/python/src/object/function.cpp~ 2020-11-13 23:37:19.244520978 +0000
|
|
|
b98e6f |
+++ boost_1_73_0/libs/python/src/object/function.cpp 2020-11-13 23:39:14.260454029 +0000
|
|
|
b98e6f |
@@ -107,7 +107,7 @@
|
|
|
b98e6f |
PyObject* p = this;
|
|
|
b98e6f |
if (Py_TYPE(&function_type) == 0)
|
|
|
b98e6f |
{
|
|
|
b98e6f |
- Py_TYPE(&function_type) = &PyType_Type;
|
|
|
b98e6f |
+ Py_SET_TYPE(&function_type, &PyType_Type);
|
|
|
b98e6f |
::PyType_Ready(&function_type);
|
|
|
b98e6f |
}
|
|
|
b98e6f |
|
|
|
b98e6f |
--- boost_1_73_0/libs/python/src/object/enum.cpp~ 2020-11-13 23:37:19.248520976 +0000
|
|
|
b98e6f |
+++ boost_1_73_0/libs/python/src/object/enum.cpp 2020-11-13 23:38:51.943467016 +0000
|
|
|
b98e6f |
@@ -153,7 +153,7 @@
|
|
|
b98e6f |
{
|
|
|
b98e6f |
if (enum_type_object.tp_dict == 0)
|
|
|
b98e6f |
{
|
|
|
b98e6f |
- Py_TYPE(&enum_type_object) = incref(&PyType_Type);
|
|
|
b98e6f |
+ Py_SET_TYPE(&enum_type_object, incref(&PyType_Type));
|
|
|
b98e6f |
#if PY_VERSION_HEX >= 0x03000000
|
|
|
b98e6f |
enum_type_object.tp_base = &PyLong_Type;
|
|
|
b98e6f |
#else
|
|
|
b98e6f |
--- boost_1_73_0/boost/python/object/make_instance.hpp~ 2020-11-14 00:26:47.356724835 +0000
|
|
|
b98e6f |
+++ boost_1_73_0/boost/python/object/make_instance.hpp 2020-11-14 00:26:49.947723159 +0000
|
|
|
b98e6f |
@@ -47,7 +47,7 @@
|
|
|
b98e6f |
|
|
|
b98e6f |
// Note the position of the internally-stored Holder,
|
|
|
b98e6f |
// for the sake of destruction
|
|
|
b98e6f |
- Py_SIZE(instance) = offsetof(instance_t, storage);
|
|
|
b98e6f |
+ Py_SET_SIZE(instance, offsetof(instance_t, storage));
|
|
|
b98e6f |
|
|
|
b98e6f |
// Release ownership of the python object
|
|
|
b98e6f |
protect.cancel();
|