Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 150326 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]
salome-med-3.2.6_gcc4-2.patch
salome-med-3.2.6_gcc4-2.patch (text/plain), 8.32 KB, created by
Richard Westwell
on 2008-04-19 21:15:16 UTC
(
hide
)
Description:
salome-med-3.2.6_gcc4-2.patch
Filename:
MIME Type:
Creator:
Richard Westwell
Created:
2008-04-19 21:15:16 UTC
Size:
8.32 KB
patch
obsolete
>diff -Naur src3.2.6.orig/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx >--- src3.2.6.orig/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx 2007-04-24 17:40:51.000000000 +0100 >+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx 2008-04-19 21:48:59.000000000 +0100 >@@ -1199,7 +1199,7 @@ > profilSize[typeNo]=pflSize; > profilList[typeNo].resize(pflSize); > profilListFromFile[typeNo].resize(pflSize); >- ret = med_2_2::MEDprofilLire(id,&profilList[typeNo][0],profilName); // cf item 16 Effective STL // IPAL13481 >+ ret = med_2_2::MEDprofilLire(id,(med_2_2::med_int*)&profilList[typeNo][0],profilName); // cf item 16 Effective STL // IPAL13481 > profilListFromFile[typeNo] = profilList[typeNo]; > profilNameList[typeNo]=string(profilName); > } >@@ -1685,7 +1685,7 @@ > ); > > if ( med_2_2::MEDMEMprofilEcr(id, >- &profil[0], >+ (med_2_2::med_int*)&profil[0], > numberOfElements, > const_cast<char *>(profilName.c_str())) < 0) > >diff -Naur src3.2.6.orig/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedMeshDriver22.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedMeshDriver22.cxx >--- src3.2.6.orig/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedMeshDriver22.cxx 2007-04-24 17:40:51.000000000 +0100 >+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MedMeshDriver22.cxx 2008-04-19 21:49:10.000000000 +0100 >@@ -345,7 +345,7 @@ > err = med_2_2::MEDstructureCoordLire(_medIdt, > const_cast <char *> > (_ptrMesh->_name.c_str()), >- MeshDimension,structure); >+ MeshDimension,(med_2_2::med_int*)structure); > > if (err != MED_VALID) > throw MEDEXCEPTION(STRING(LOC) <<"Error in reading the structure of grid : |" << _meshName << "|" ) ; >@@ -867,7 +867,7 @@ > > med_int major, minor, release; > >- if ( med_2_2::MEDversionLire(_medIdt, &major, &minor, &release) != 0 ) >+ if ( med_2_2::MEDversionLire(_medIdt, (med_2_2::med_int*)&major, (med_2_2::med_int*)&minor, (med_2_2::med_int*)&release) != 0 ) > { > // error : we suppose we have not a good med file ! > delete[] tmp_cells_count ; >@@ -1392,7 +1392,7 @@ > const_cast <char *> (_ptrMesh->_name.c_str()), > Entity, > med_2_2::MED_NOD, >- &ConnectivitySize); >+ (med_2_2::med_int*)&ConnectivitySize); > if (err1 != MED_VALID) > { > MESSAGE(LOC<<": MEDpolygoneInfo returns "<<err1); >@@ -1404,9 +1404,9 @@ > > med_err err2 = MEDpolygoneConnLire(_medIdt, > const_cast <char *> (_ptrMesh->_name.c_str()), >- PolygonsConnectivityIndex, >+ (med_2_2::med_int*)PolygonsConnectivityIndex, > NumberOfPolygons+1, >- PolygonsConnectivity, >+ (med_2_2::med_int*)PolygonsConnectivity, > Entity, > med_2_2::MED_NOD); > if (err2 != MED_VALID) >@@ -1483,8 +1483,8 @@ > med_err err3 = MEDpolyedreInfo(_medIdt, > const_cast <char *> (_ptrMesh->_name.c_str()), > med_2_2::MED_NOD, >- &FacesIndexSize, >- &NumberOfNodes); >+ (med_2_2::med_int*)&FacesIndexSize, >+ (med_2_2::med_int*)&NumberOfNodes); > NumberOfFaces = FacesIndexSize-1; > if (err3 != MED_VALID) > { >@@ -1498,11 +1498,11 @@ > > med_err err4 = MEDpolyedreConnLire(_medIdt, > const_cast <char *> (_ptrMesh->_name.c_str()), >- PolyhedronIndex, >+ (med_2_2::med_int*)PolyhedronIndex, > NumberOfPolyhedron+1, >- FacesIndex, >+ (med_2_2::med_int*)FacesIndex, > NumberOfFaces+1, >- Nodes, >+ (med_2_2::med_int*)Nodes, > med_2_2::MED_NOD); > if (err4 != MED_VALID) > { >@@ -1705,12 +1705,12 @@ > err = med_2_2::MEDfamInfo(_medIdt,const_cast <char *> > (_meshName.c_str()), > (i+1),const_cast <char *> >- (FamilyName.c_str()), &tmp_FamilyIdentifier, >- tmp_AttributesIdentifier,tmp_AttributesValues, >+ (FamilyName.c_str()), (med_2_2::med_int*)&tmp_FamilyIdentifier, >+ (med_2_2::med_int*)tmp_AttributesIdentifier, (med_2_2::med_int*)tmp_AttributesValues, > const_cast <char *> > (AttributesDescription.c_str()), >- &tmp_NumberOfAttributes, const_cast <char *> >- (GroupsNames.c_str()),&tmp_NumberOfGroups); >+ (med_2_2::med_int*)&tmp_NumberOfAttributes, const_cast <char *> >+ (GroupsNames.c_str()),(med_2_2::med_int*)&tmp_NumberOfGroups); > FamilyIdentifier = tmp_FamilyIdentifier ; > int ii ; > for ( ii = 0 ; ii < NumberOfAttributes ; ii++ ) { >@@ -1835,7 +1835,7 @@ > #if defined(IRIX64) || defined(OSF1) || defined(VPP5000) || defined(PCLINUX64) > med_int * tmp_MEDArrayNodeFamily = new med_int[_ptrMesh->getNumberOfNodes()] ; > err = MEDfamLire(_medIdt, const_cast <char *> >- (_ptrMesh->_name.c_str()), tmp_MEDArrayNodeFamily, >+ (_ptrMesh->_name.c_str()), (med_2_2::med_int*)tmp_MEDArrayNodeFamily, > _ptrMesh->getNumberOfNodes(), med_2_2::MED_NOEUD, > (med_2_2::med_geometrie_element) MED_NONE); > int i ; >@@ -2350,7 +2350,7 @@ > > #if defined(IRIX64) || defined(OSF1) || defined(VPP5000) || defined(PCLINUX64) > const int * NodesNumbers = _ptrMesh->_coordinate->getNodesNumbers() ; >- med_2_2::med_int * tmp_NodesNumbers = new med_int[_ptrMesh->_numberOfNodes] ; >+ med_2_2::med_int * tmp_NodesNumbers = (med_2_2::med_int*)(new med_int[_ptrMesh->_numberOfNodes]) ; > int ii ; > for ( ii = 0 ; ii < _ptrMesh->_numberOfNodes ; ii++ ) > tmp_NodesNumbers[ii] = NodesNumbers[ii] ; >@@ -2737,7 +2737,7 @@ > const_cast <char *> (_meshName.c_str()), > tmp_PolyhedronIndex, > nbPolyhedron + 1, >- &FacesGeometricTypes[0], >+ (med_2_2::med_int*)&FacesGeometricTypes[0], > NumberOfFaces, > tmp_PolyhedronConnectivity, > med_2_2::MED_DESC); >diff -Naur src3.2.6.orig/MED_SRC_3.2.6/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx >--- src3.2.6.orig/MED_SRC_3.2.6/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx 2007-04-24 17:40:51.000000000 +0100 >+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx 2008-04-19 21:48:53.000000000 +0100 >@@ -644,7 +644,7 @@ > MED::TMeshInfo& aMeshInfo = *theInfo.myMeshInfo; > > char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL; >- med_int* anElemNum = theInfo.myIsElemNum? &theInfo.myElemNum[0]: NULL; >+ med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&theInfo.myElemNum[0]: NULL; > > TErr aRet = MEDnoeudsLire(myFile->Id(), > &aMeshInfo.myName[0], >@@ -682,7 +682,7 @@ > MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo; > > char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL; >- med_int* anElemNum = theInfo.myIsElemNum? &anInfo.myElemNum[0]: NULL; >+ med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&anInfo.myElemNum[0]: NULL; > > TErr aRet = MEDnoeudsEcr(myFile->Id(), > &aMeshInfo.myName[0], >@@ -1152,7 +1152,7 @@ > TInt aNbElem = theInfo.myElemNum.size(); > > char* anElemNames = theInfo.myIsElemNames? &theInfo.myElemNames[0]: NULL; >- med_int* anElemNum = theInfo.myIsElemNum? &theInfo.myElemNum[0]: NULL; >+ med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&theInfo.myElemNum[0]: NULL; > > TErr aRet; > aRet = MEDelementsLire(myFile->Id(), >@@ -1191,7 +1191,7 @@ > MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo; > > char* anElemNames = theInfo.myIsElemNames? &anInfo.myElemNames[0]: NULL; >- med_int* anElemNum = theInfo.myIsElemNum? &anInfo.myElemNum[0]: NULL; >+ med_int* anElemNum = theInfo.myIsElemNum? (med_int*)&anInfo.myElemNum[0]: NULL; > > TErr aRet; > aRet = MEDelementsEcr(myFile->Id(), >@@ -1426,7 +1426,7 @@ > aRet = MEDprofilInfo(myFile->Id(), > theId, > &aName[0], >- &aSize); >+ (med_int*)&aSize); > if(theErr) > *theErr = aRet; > else if(aRet < 0) >@@ -1449,7 +1449,7 @@ > > TErr aRet; > aRet = MEDprofilLire(myFile->Id(), >- &theInfo.myElemNum[0], >+ (med_int*)&theInfo.myElemNum[0], > &theInfo.myName[0]); > if(theErr) > *theErr = aRet; >@@ -2006,7 +2006,7 @@ > aRet = MEDstructureCoordEcr(myFile->Id(), > &aMeshInfo.myName[0], > aMeshInfo.myDim, >- &anInfo.myGrilleStructure[0]); >+ (med_int*)&anInfo.myGrilleStructure[0]); > if(aRet < 0) > EXCEPTION(runtime_error,"SetGrilleInfo - MEDstructureCoordEcr(...)"); >
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