Merge from BR_V5_DEV 16Feb09

[modules/med.git] / src / MEDWrapper / V2_1 / Core / MEDdatasetNumLire.cxx

diff --git a/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx b/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx
index 8420c22f5c18b2f2b3bc0013670a5ca1d56067a4..a11d83d4b9b3d970e9aa77be2a39ab6fdccbfa61 100644 (file)
--- a/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx
+++ b/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx
@@ -204,7 +204,13 @@ _MEDdatasetNumLire(med_idt pere,char *nom,med_type_champ type,
                }
            }
            
-#ifdef HDF_NEW_API
+#ifdef HDF_NEW_API2
+           if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) 
+             return -1; 
+           
+           if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) 
+             return -1; 
+#elif defined HDF_NEW_API
            if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) 
              return -1; 
            
@@ -239,7 +245,13 @@ _MEDdatasetNumLire(med_idt pere,char *nom,med_type_champ type,
                }             
            }
            
-#ifdef HDF_NEW_API
+#ifdef HDF_NEW_API2
+           if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) 
+             return -1; 
+           
+           if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) 
+             return -1; 
+#elif defined HDF_NEW_API
            if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) 
              return -1; 
            
@@ -325,7 +337,10 @@ _MEDdatasetNumLire(med_idt pere,char *nom,med_type_champ type,
                }
            }
            
-#ifdef HDF_NEW_API
+#ifdef HDF_NEW_API2
+           if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) 
+             return -1;
+#elif defined HDF_NEW_API
            if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) 
              return -1;
 #else
@@ -369,7 +384,13 @@ _MEDdatasetNumLire(med_idt pere,char *nom,med_type_champ type,
                }
            }
            
-#ifdef HDF_NEW_API
+#ifdef HDF_NEW_API2
+           if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) 
+             return -1; 
+           
+           if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) 
+             return -1;          
+#elif defined HDF_NEW_API
            if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) 
              return -1;