From: dmv <dmv@opencascade.com>
Date: Tue, 30 Dec 2008 14:15:28 +0000 (+0000)
Subject: 0020062: [CEA 295] Type coherence in *.i files
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8528412c9781776f0a82b4c4c1726943932d3a3b;p=modules%2Fkernel.git

0020062: [CEA 295] Type coherence in *.i files
---

diff --git a/src/Batch_SWIG/libBatch_Swig_typemap.i b/src/Batch_SWIG/libBatch_Swig_typemap.i
index 6b65d8f89..242a18c6a 100644
--- a/src/Batch_SWIG/libBatch_Swig_typemap.i
+++ b/src/Batch_SWIG/libBatch_Swig_typemap.i
@@ -83,7 +83,7 @@
   // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
 	// qui convertit un Versatile en PyObject et vice versa
 	PyObject *key, *value;
-	int pos = 0;
+	Py_ssize_t pos = 0;
 	while (PyDict_Next($input, &pos, &key, &value)) {
 		std::string mk = PyString_AsString(key);
 		Batch::PyVersatile PyV = value;
@@ -117,7 +117,7 @@
   // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
 	// qui convertit un Versatile en PyObject et vice versa
 	PyObject *key, *value;
-	int pos = 0;
+	Py_ssize_t pos = 0;
 	while (PyDict_Next($input, &pos, &key, &value)) {
 		std::string mk = PyString_AsString(key);
 		Batch::PyVersatile PyV = value;
@@ -165,7 +165,7 @@
 
 	// on itere sur toutes les clefs du dictionnaire
 	PyObject *key, *value;
-	int pos = 0;
+	Py_ssize_t pos = 0;
 	while (PyDict_Next($input, &pos, &key, &value)) {
 		std::string mk  = PyString_AsString(key);
 		std::string val = PyString_AsString(value);
@@ -187,7 +187,7 @@
 
 	// on itere sur toutes les clefs du dictionnaire
 	PyObject *key, *value;
-	int pos = 0;
+	Py_ssize_t pos = 0;
 	while (PyDict_Next($input, &pos, &key, &value)) {
 		std::string mk  = PyString_AsString(key);
 		std::string val = PyString_AsString(value);
diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am
index 853adbf7f..d01de24a8 100644
--- a/src/LifeCycleCORBA/Makefile.am
+++ b/src/LifeCycleCORBA/Makefile.am
@@ -109,7 +109,7 @@ Test_LifeCycleCORBA_LDADD    = \
 	../Registry/libRegistry.la \
 	../Notification/libSalomeNotification.la \
 	../Container/libSalomeContainer.la \
-	../HDFPersist/libSalomeHDFPersist.la \	
+	../HDFPersist/libSalomeHDFPersist.la \
 	$(COMMON_LIBS) \
 	@CORBA_LIBS@
 
@@ -126,7 +126,7 @@ TestContainerManager_LDADD    = \
 	../Notification/libSalomeNotification.la \
 	../Container/libSalomeContainer.la \
 	../HDFPersist/libSalomeHDFPersist.la \
-	../HDFPersist/libSalomeHDFPersist.la \	
+	../HDFPersist/libSalomeHDFPersist.la \
 	$(COMMON_LIBS) \
 	@CORBA_LIBS@
 
diff --git a/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i b/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
index fbd3c86db..4791f4247 100644
--- a/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
+++ b/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
@@ -166,7 +166,7 @@ struct omniORBpyAPI {
       param->parallelLib = CORBA::string_dup("");
       param->nb_component_nodes = 0;
       PyObject *key, *value;
-      int pos = 0;
+      Py_ssize_t pos = 0;
       while (PyDict_Next($input, &pos, &key, &value))
 	{
 	  char* keystr = PyString_AsString(key);
diff --git a/src/SALOMEDSImpl/Makefile.am b/src/SALOMEDSImpl/Makefile.am
index f837198ad..0c64eabaf 100644
--- a/src/SALOMEDSImpl/Makefile.am
+++ b/src/SALOMEDSImpl/Makefile.am
@@ -220,5 +220,5 @@ bin_PROGRAMS = testDS
 testDS_SOURCES  = testDS.cxx
 testDS_CPPFLAGS = $(COMMON_CPPFLAGS)
 testDS_LDADD    = libSalomeDSImpl.la \
-	../HDFPersist/libSalomeHDFPersist.la \	
+	../HDFPersist/libSalomeHDFPersist.la \
 	$(HDF5_LIBS)