Attachment #140637 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 42-50 Link Here

(-)src3.2.6.orig/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc (-2 / +2 lines)
42	"; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));	42	"; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));
43	if(CORBA::is_nil(thePOA))	43	if(CORBA::is_nil(thePOA))
44	#ifndef WNT	44	#ifndef WNT
45	myPOA = PortableServer::RefCountServantBase::_default_POA();	45	myPOA = PortableServer::ServantBase::_default_POA();
46	#else	46	#else
47	myPOA = RefCountServantBase::_default_POA();	47	myPOA = ServantBase::_default_POA();
48	#endif	48	#endif
49	else	49	else
50	myPOA = PortableServer::POA::_duplicate(thePOA);	50	myPOA = PortableServer::POA::_duplicate(thePOA);




            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);

            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);

            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);

            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);

            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);

            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);

            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);

            param->isMPI = false;
            PyObject *key, *value;
            int pos = 0;
            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
            {
                char* keystr = PyString_AsString(key);
                printf("key: %s\n", keystr);




        };

        if (status) {
            const char*  Asender;
            const char*  Agraph;
            const char*  Atype;
            CORBA::ULong Acounter;
            CORBA::ULong Astamp;
            const char*  Adate;
            const char*  Anode;
            const char*  Amessage;
            event->filterable_data[0].value >>= Asender;
            event->filterable_data[1].value >>= Agraph;
            event->filterable_data[2].value >>= Atype;

Lines 44-50 Link Here

(-)src3.2.6.orig/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx (-2 / +2 lines)
44	MESSAGE("activate object");	44	MESSAGE("activate object");
45	_thisObj = this ;	45	_thisObj = this ;
46	_id = _poa->activate_object(_thisObj);	46	_id = _poa->activate_object(_thisObj);
47	SCRUTE(pd_refCount);	47	//SCRUTE(pd_refCount);
48	}	48	}
49		49
50	Engines_TestComponent_i::Engines_TestComponent_i()	50	Engines_TestComponent_i::Engines_TestComponent_i()
Lines 60-66 Link Here
60	{	60	{
61	char s[100];	61	char s[100];
62	sprintf(s, "TestComponent_i : L = %ld", (long) L);	62	sprintf(s, "TestComponent_i : L = %ld", (long) L);
63	SCRUTE(pd_refCount);	63	//SCRUTE(pd_refCount);
64		64
65	return CORBA::string_dup(s);	65	return CORBA::string_dup(s);
66	}	66	}

Return to bug 155974

Lines 3236-3242 Link Here

(-)src3.2.6.orig/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp (-8 / +8 lines)
3236	param->isMPI = false;	3236	param->isMPI = false;
3237	PyObject key, value;	3237	PyObject key, value;
3238	int pos = 0;	3238	int pos = 0;
3239	while (PyDict_Next(obj1, &pos, &key, &value))	3239	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
3240	{	3240	{
3241	char* keystr = PyString_AsString(key);	3241	char* keystr = PyString_AsString(key);
3242	printf("key: %s\n", keystr);	3242	printf("key: %s\n", keystr);
Lines 3366-3372 Link Here
3366	param->isMPI = false;	3366	param->isMPI = false;
3367	PyObject key, value;	3367	PyObject key, value;
3368	int pos = 0;	3368	int pos = 0;
3369	while (PyDict_Next(obj1, &pos, &key, &value))	3369	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
3370	{	3370	{
3371	char* keystr = PyString_AsString(key);	3371	char* keystr = PyString_AsString(key);
3372	printf("key: %s\n", keystr);	3372	printf("key: %s\n", keystr);
Lines 3558-3564 Link Here
3558	param->isMPI = false;	3558	param->isMPI = false;
3559	PyObject key, value;	3559	PyObject key, value;
3560	int pos = 0;	3560	int pos = 0;
3561	while (PyDict_Next(obj1, &pos, &key, &value))	3561	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
3562	{	3562	{
3563	char* keystr = PyString_AsString(key);	3563	char* keystr = PyString_AsString(key);
3564	printf("key: %s\n", keystr);	3564	printf("key: %s\n", keystr);
Lines 3688-3694 Link Here
3688	param->isMPI = false;	3688	param->isMPI = false;
3689	PyObject key, value;	3689	PyObject key, value;
3690	int pos = 0;	3690	int pos = 0;
3691	while (PyDict_Next(obj1, &pos, &key, &value))	3691	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
3692	{	3692	{
3693	char* keystr = PyString_AsString(key);	3693	char* keystr = PyString_AsString(key);
3694	printf("key: %s\n", keystr);	3694	printf("key: %s\n", keystr);
Lines 3880-3886 Link Here
3880	param->isMPI = false;	3880	param->isMPI = false;
3881	PyObject key, value;	3881	PyObject key, value;
3882	int pos = 0;	3882	int pos = 0;
3883	while (PyDict_Next(obj1, &pos, &key, &value))	3883	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
3884	{	3884	{
3885	char* keystr = PyString_AsString(key);	3885	char* keystr = PyString_AsString(key);
3886	printf("key: %s\n", keystr);	3886	printf("key: %s\n", keystr);
Lines 4010-4016 Link Here
4010	param->isMPI = false;	4010	param->isMPI = false;
4011	PyObject key, value;	4011	PyObject key, value;
4012	int pos = 0;	4012	int pos = 0;
4013	while (PyDict_Next(obj1, &pos, &key, &value))	4013	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
4014	{	4014	{
4015	char* keystr = PyString_AsString(key);	4015	char* keystr = PyString_AsString(key);
4016	printf("key: %s\n", keystr);	4016	printf("key: %s\n", keystr);
Lines 4329-4335 Link Here
4329	param->isMPI = false;	4329	param->isMPI = false;
4330	PyObject key, value;	4330	PyObject key, value;
4331	int pos = 0;	4331	int pos = 0;
4332	while (PyDict_Next(obj1, &pos, &key, &value))	4332	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
4333	{	4333	{
4334	char* keystr = PyString_AsString(key);	4334	char* keystr = PyString_AsString(key);
4335	printf("key: %s\n", keystr);	4335	printf("key: %s\n", keystr);
Lines 4463-4469 Link Here
4463	param->isMPI = false;	4463	param->isMPI = false;
4464	PyObject key, value;	4464	PyObject key, value;
4465	int pos = 0;	4465	int pos = 0;
4466	while (PyDict_Next(obj1, &pos, &key, &value))	4466	while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
4467	{	4467	{
4468	char* keystr = PyString_AsString(key);	4468	char* keystr = PyString_AsString(key);
4469	printf("key: %s\n", keystr);	4469	printf("key: %s\n", keystr);

Lines 93-106 Link Here

(-)src3.2.6.orig/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx (-6 / +6 lines)
93	};	93	};
94		94
95	if (status) {	95	if (status) {
96	char* Asender;	96	const char* Asender;
97	char* Agraph;	97	const char* Agraph;
98	char* Atype;	98	const char* Atype;
99	CORBA::ULong Acounter;	99	CORBA::ULong Acounter;
100	CORBA::ULong Astamp;	100	CORBA::ULong Astamp;
101	char* Adate;	101	const char* Adate;
102	char* Anode;	102	const char* Anode;
103	char* Amessage;	103	const char* Amessage;
104	event->filterable_data[0].value >>= Asender;	104	event->filterable_data[0].value >>= Asender;
105	event->filterable_data[1].value >>= Agraph;	105	event->filterable_data[1].value >>= Agraph;
106	event->filterable_data[2].value >>= Atype;	106	event->filterable_data[2].value >>= Atype;