Attachment #183324 for bug #155974

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

and this patch

Lines 220-230 Link Here

(-)src4.1.4.old/MED_SRC_4.1.4/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx (-1 / +38 lines)
220	}	220	}
221		221
222	#ifdef HDF_NEW_API	222	#ifdef HDF_NEW_API
		223
		224	#if H5_VERS_RELEASE < 7
223	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	225	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
224	return -1;	226	return -1;
225		227
226	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	228	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
227	return -1;	229	return -1;
		230	#else
		231	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		232	return -1;
		233
		234	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		235	return -1;
		236	#endif
		237
228	#else	238	#else
229	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)	239	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)
230	return -1;	240	return -1;
Lines 255-266 Link Here
255	}	265	}
256		266
257	#ifdef HDF_NEW_API	267	#ifdef HDF_NEW_API
		268
		269	#if H5_VERS_RELEASE < 7
258	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	270	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
259	return -1;	271	return -1;
260		272
261	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	273	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
262	return -1;	274	return -1;
263	#else	275	#else
		276	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		277	return -1;
		278
		279	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		280	return -1;
		281	#endif
		282
		283	#else
264	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)	284	if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)
265	return -1;	285	return -1;
266		286
Lines 342-350 Link Here
342	}	362	}
343		363
344	#ifdef HDF_NEW_API	364	#ifdef HDF_NEW_API
		365
		366	#if H5_VERS_RELEASE < 7
345	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	367	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
346	return -1;	368	return -1;
347	#else	369	#else
		370	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		371	return -1;
		372	#endif
		373
		374	#else
348	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,(size_t)pcount[0], (const hssize_t **) pfldsk ) ) <0)	375	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,(size_t)pcount[0], (const hssize_t **) pfldsk ) ) <0)
349	return -1;	376	return -1;
350	#endif	377	#endif
Lines 382-393 Link Here
382	}	409	}
383		410
384	#ifdef HDF_NEW_API	411	#ifdef HDF_NEW_API
		412
		413	#if H5_VERS_RELEASE < 7
385	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0)	414	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0)
386	return -1;	415	return -1;
387		416
388	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	417	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
389	return -1;	418	return -1;
390	#else	419	#else
		420	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t *) pflmem ) ) <0)
		421	return -1;
		422
		423	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		424	return -1;
		425	#endif
		426
		427	#else
391	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,(size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)	428	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,(size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)
392	return -1;	429	return -1;
393		430

Lines 205-216 Link Here

(-)src4.1.4.old/MED_SRC_4.1.4/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx (-1 / +38 lines)
205	}	205	}
206		206
207	#ifdef HDF_NEW_API	207	#ifdef HDF_NEW_API
		208
		209	#if H5_VERS_RELEASE < 7
208	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	210	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
209	return -1;	211	return -1;
210		212
211	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	213	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
212	return -1;	214	return -1;
213	#else	215	#else
		216	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		217	return -1;
		218
		219	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		220	return -1;
		221	#endif
		222
		223	#else
214	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)	224	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)
215	return -1;	225	return -1;
216		226
Lines 240-251 Link Here
240	}	250	}
241		251
242	#ifdef HDF_NEW_API	252	#ifdef HDF_NEW_API
		253
		254	#if H5_VERS_RELEASE < 7
243	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	255	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
244	return -1;	256	return -1;
245		257
246	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)	258	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
247	return -1;	259	return -1;
248	#else	260	#else
		261	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		262	return -1;
		263
		264	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
		265	return -1;
		266	#endif
		267
		268	#else
249	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)	269	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)
250	return -1;	270	return -1;
251		271
Lines 326-334 Link Here
326	}	346	}
327		347
328	#ifdef HDF_NEW_API	348	#ifdef HDF_NEW_API
		349
		350	#if H5_VERS_RELEASE < 7
329	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	351	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
330	return -1;	352	return -1;
331	#else	353	#else
		354	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		355	return -1;
		356	#endif
		357
		358	#else
332	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,(size_t)pcount[0], (const hssize_t **) pfldsk ) ) <0)	359	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,(size_t)pcount[0], (const hssize_t **) pfldsk ) ) <0)
333	return -1;	360	return -1;
334	#endif	361	#endif
Lines 370-380 Link Here
370	}	397	}
371		398
372	#ifdef HDF_NEW_API	399	#ifdef HDF_NEW_API
		400
		401	#if H5_VERS_RELEASE < 7
373	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)	402	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
374	return -1;	403	return -1;
375		404
376	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)	405	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
377	return -1;	406	return -1;
		407	#else
		408	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
		409	return -1;
		410
		411	if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
		412	return -1;
		413	#endif
		414
378	#else	415	#else
379	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)	416	if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, (size_t)pcount[0], (const hssize_t **) pflmem ) ) <0)
380	return -1;	417	return -1;

Return to bug 155974