You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/09/27 15:19:44 UTC
svn commit: r1526892 - in /qpid/trunk/qpid/extras/dispatch/src:
python_embedded.c router_node.c
Author: tross
Date: Fri Sep 27 13:19:44 2013
New Revision: 1526892
URL: http://svn.apache.org/r1526892
Log:
NO-JIRA - Fixed three aliasing issues that broke a "Release" build.
Modified:
qpid/trunk/qpid/extras/dispatch/src/python_embedded.c
qpid/trunk/qpid/extras/dispatch/src/router_node.c
Modified: qpid/trunk/qpid/extras/dispatch/src/python_embedded.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/python_embedded.c?rev=1526892&r1=1526891&r2=1526892&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/python_embedded.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/python_embedded.c Fri Sep 27 13:19:44 2013
@@ -614,6 +614,9 @@ static void dx_register_log_constant(PyO
static void dx_python_setup()
{
+ PyObject *laType = (PyObject*) &LogAdapterType;
+ PyObject *ioaType = (PyObject*) &IoAdapterType;
+
LogAdapterType.tp_new = PyType_GenericNew;
IoAdapterType.tp_new = PyType_GenericNew;
if ((PyType_Ready(&LogAdapterType) < 0) || (PyType_Ready(&IoAdapterType) < 0)) {
@@ -626,7 +629,7 @@ static void dx_python_setup()
//
// Add LogAdapter
//
- Py_INCREF(&LogAdapterType);
+ Py_INCREF(laType);
PyModule_AddObject(m, "LogAdapter", (PyObject*) &LogAdapterType);
dx_register_log_constant(m, "LOG_TRACE", LOG_TRACE);
@@ -638,7 +641,7 @@ static void dx_python_setup()
dx_register_log_constant(m, "LOG_CRITICAL", LOG_CRITICAL);
//
- Py_INCREF(&IoAdapterType);
+ Py_INCREF(ioaType);
PyModule_AddObject(m, "IoAdapter", (PyObject*) &IoAdapterType);
Py_INCREF(m);
Modified: qpid/trunk/qpid/extras/dispatch/src/router_node.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/router_node.c?rev=1526892&r1=1526891&r2=1526892&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/router_node.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/router_node.c Fri Sep 27 13:19:44 2013
@@ -1132,6 +1132,7 @@ static PyTypeObject RouterAdapterType =
static void dx_router_python_setup(dx_router_t *router)
{
+ PyObject *raType = (PyObject*) &RouterAdapterType;
PyObject *pDispatchModule = dx_python_module();
RouterAdapterType.tp_new = PyType_GenericNew;
@@ -1141,7 +1142,7 @@ static void dx_router_python_setup(dx_ro
return;
}
- Py_INCREF(&RouterAdapterType);
+ Py_INCREF(raType);
PyModule_AddObject(pDispatchModule, "RouterAdapter", (PyObject*) &RouterAdapterType);
//
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org