Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 168552 Details for
Bug 155974
[science overlay] sci-misc/salome-* (New packages)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for compilation with hdf5-1.6.7
salome-med-3.2.6-hdf5-1.6.7.patch (text/plain), 13.08 KB, created by
Bert Karwatzki
on 2008-10-15 10:21:23 UTC
(
hide
)
Description:
Patch for compilation with hdf5-1.6.7
Filename:
MIME Type:
Creator:
Bert Karwatzki
Created:
2008-10-15 10:21:23 UTC
Size:
13.08 KB
patch
obsolete
>diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx >--- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-07-25 09:16:10.000000000 +0200 >+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-10-15 12:03:32.000000000 +0200 >@@ -258,12 +258,22 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; > #else >+ 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; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; > >@@ -291,13 +301,23 @@ > } > } > >-#ifdef HDF_NEW_API >+#ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; > #else >+ 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; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; > >@@ -378,9 +398,16 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) > return -1; > #else >+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) >+ return -1; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) > return -1; > #endif >@@ -418,11 +445,21 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; >+ return -1; >+#else >+ 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; >+#endif >+ > #else > if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; >diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx >--- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-07-25 09:16:10.000000000 +0200 >+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-10-15 12:03:08.000000000 +0200 >@@ -205,27 +205,37 @@ > { /* switch pflmod pout FULL_INTERLACE*/ > case MED_GLOBALE : > >- /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */ >- if ( (memspace = H5Screate_simple (1, size, NULL)) <0) >- return -1; >+ /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */ >+ if ( (memspace = H5Screate_simple (1, size, NULL)) <0) >+ return -1; >+ >+ for (dim=firstdim; dim < lastdim; dim++) { >+ >+ for (i=0; i < psize; i++) /* i balaye les élements du profil */ >+ for (j=0; j < ngauss; j++) { >+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); >+ pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim; >+ pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; >+ } >+ } >+ >+ #ifdef HDF_NEW_API > >- for (dim=firstdim; dim < lastdim; dim++) { >- >- for (i=0; i < psize; i++) /* i balaye les élements du profil */ >- for (j=0; j < ngauss; j++) { >- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); >- pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim; >- pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; >- } >- } >- >-#ifdef HDF_NEW_API >+#if H5_VERS_RELEASE < 7 > 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; > #else >+ 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; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; > >@@ -255,12 +265,22 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; > #else >+ 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; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; > >@@ -326,39 +346,46 @@ > pfldsk = (med_size *) malloc(sizeof(med_size)*pcount[0]); > #else > pfldsk = (med_ssize *) malloc(sizeof(med_ssize)*pcount[0]); >-#endif >+ #endif > >- switch(pflmod) >- { /*switch plfmod pour NO_INTERLACE */ >- case MED_GLOBALE : >- >- for (dim=firstdim; dim < lastdim; dim++) { >- >- for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ >- for (j=0; j < ngauss; j++) { >- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); >- pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j; >- } >- } >- >+ switch(pflmod) >+ { /*switch plfmod pour NO_INTERLACE */ >+ case MED_GLOBALE : >+ >+ for (dim=firstdim; dim < lastdim; dim++) { >+ >+ for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ >+ for (j=0; j < ngauss; j++) { >+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); >+ pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j; >+ } >+ } >+ > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) > return -1; > #else >+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) >+ return -1; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) > return -1; > #endif >- >+ > if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0) > return -1; >- >+ > break; >- >+ > case MED_COMPACT : >- >- /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */ >- /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */ >- /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */ >+ >+ /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */ >+ /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */ >+ /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */ > > if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0) > return -1; >@@ -368,26 +395,36 @@ > #else > pflmem = (med_ssize *) malloc (sizeof(med_ssize)*pcount[0]); > #endif >- >+ > /* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/ >- >+ > for (dim=firstdim; dim < lastdim; dim++) { >- >+ > for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ > for (j=0; j < ngauss; j++) { > index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); >- pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j; >+ pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j; > pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; > } > } >- >+ > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; > #else >+ 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; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; > >diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx >--- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-07-25 09:16:10.000000000 +0200 >+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-10-15 12:01:30.000000000 +0200 >@@ -204,12 +204,22 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; > #else >+ 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; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; > >@@ -239,11 +249,21 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; >+#else >+ 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; >+#endif >+ > #else > if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1; >@@ -325,9 +345,16 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) > return -1; > #else >+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) >+ return -1; >+#endif >+ >+#else > if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) > return -1; > #endif >@@ -369,11 +396,21 @@ > } > > #ifdef HDF_NEW_API >+ >+#if H5_VERS_RELEASE < 7 > 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; >+ return -1; >+#else >+ 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; >+#endif >+ > #else > if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) > return -1;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 155974
:
102571
|
102572
|
102573
|
114639
|
114650
|
114651
|
114653
|
114655
|
114657
|
114659
|
114660
|
114662
|
114664
|
120027
|
120226
|
131980
|
131981
|
131983
|
137331
|
137336
|
137338
|
137719
|
138048
|
138578
|
138580
|
138581
|
138582
|
138583
|
138584
|
138586
|
138588
|
138877
|
138896
|
138925
|
138960
|
139043
|
139045
|
139956
|
139958
|
139964
|
139965
|
139973
|
140002
|
140005
|
140007
|
140030
|
140032
|
140064
|
140066
|
140068
|
140071
|
140073
|
140086
|
140088
|
140280
|
140283
|
140301
|
140303
|
140366
|
140368
|
140373
|
140375
|
140378
|
140385
|
140386
|
140455
|
140466
|
140468
|
140472
|
140474
|
140637
|
141242
|
141243
|
141250
|
141252
|
141254
|
141256
|
141257
|
141462
|
141473
|
141474
|
141475
|
141565
|
141572
|
142892
|
142894
|
142905
|
143984
|
143986
|
144011
|
144061
|
144063
|
144084
|
144086
|
144089
|
144091
|
144093
|
144098
|
144105
|
144107
|
144117
|
144119
|
144182
|
144184
|
144185
|
144187
|
144188
|
144198
|
144223
|
144305
|
144306
|
144308
|
144310
|
144311
|
144313
|
144314
|
144316
|
144318
|
144320
|
144347
|
144348
|
144350
|
144352
|
144353
|
144354
|
144356
|
144357
|
144557
|
145883
|
145885
|
145887
|
146138
|
146414
|
147142
|
147146
|
148604
|
148606
|
148607
|
148609
|
148611
|
148613
|
148615
|
148617
|
148618
|
148619
|
150326
|
151031
|
151032
|
151034
|
151036
|
151038
|
151039
|
151040
|
151042
|
151044
|
151045
|
152339
|
152341
|
152343
|
152345
|
152347
|
152349
|
152351
|
152353
|
152355
|
152357
|
152359
|
152361
|
152363
|
152365
|
152369
|
152371
|
152979
|
153067
|
154323
|
154325
|
154327
|
154329
|
154331
|
154333
|
154335
|
158563
|
161347
|
163275
|
163841
|
163842
|
164412
|
164611
| 168552 |
168560
|
168624
|
168626
|
168724
|
168726
|
168734
|
168736
|
178432
|
178434
|
178739
|
179160
|
179161
|
179162
|
179237
|
179627
|
179628
|
183321
|
183323
|
183324
|
183325
|
183327
|
183329
|
183347
|
183348
|
189058
|
189059
|
189061
|
200799
|
200800
|
200802
|
200803
|
200805
|
200807
|
200809
|
200811
|
200812
|
200813
|
200815
|
200816
|
200818
|
200820
|
200821
|
200823
|
200825
|
204604
|
204699
|
204980
|
205339
|
223869
|
223871
|
232539
|
234261
|
253803
|
253805
|
254743
|
254751
|
254755
|
257260
|
257261
|
268839
|
268883
|
278009
|
286253
|
286255
|
286257
|
286259
|
286261
|
286263
|
286265
|
286267
|
286269
|
286271
|
286273
|
323878