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 6b65d8f8911d57d91979aedce20f82f3cbebb798..242a18c6a6c9e4dc52e7ea21a28b6e9440328db6 100644 (file)
--- 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 853adbf7f4e4f079331cf32692e1f4bba07c238e..d01de24a86de34011c846fb636dfe2fd93cbcfb2 100644 (file)
--- 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 fbd3c86dbe1bdc1e6525df766b57e7be4638981f..4791f4247a12cdafecba504b5abdfc009c0fa827 100644 (file)
--- 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 f837198add671952c2bbc9e0c2d92abff0d7c849..0c64eabafceef329c4a7252eb01b33ac3c37d4ab 100644 (file)
--- 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)