Merge from BR_V5_DEV 16Feb09

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

diff --git a/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx b/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx
index f2b1ce8d1dbdde23396d95bb9ee3ea4af457b99d..5c6f69ed9ca9348518bed62fc93a9d2ab095d0ec 100644 (file)
--- a/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx
+++ b/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx
@@ -219,7 +219,13 @@ _MEDdatasetNumEcrire(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; 
              
@@ -254,7 +260,13 @@ _MEDdatasetNumEcrire(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; 
            
@@ -341,7 +353,10 @@ _MEDdatasetNumEcrire(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
@@ -381,7 +396,13 @@ _MEDdatasetNumEcrire(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;