Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 183327 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]
typecasting madness, probably only required on amd64
salome-med-4.1.4-med_int_2.patch (text/plain), 8.61 KB, created by
Bert Karwatzki
on 2009-02-27 00:20:09 UTC
(
hide
)
Description:
typecasting madness, probably only required on amd64
Filename:
MIME Type:
Creator:
Bert Karwatzki
Created:
2009-02-27 00:20:09 UTC
Size:
8.61 KB
patch
obsolete
>diff -aur src4.1.4.old/MED_SRC_4.1.4/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src4.1.4/MED_SRC_4.1.4/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx >--- src4.1.4.old/MED_SRC_4.1.4/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2009-01-14 00:43:53.000000000 +0100 >+++ src4.1.4/MED_SRC_4.1.4/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2009-02-27 00:21:01.000000000 +0100 >@@ -182,7 +182,7 @@ > med_2_3::med_int njoint = med_2_3::MEDnJoint(fid, meshname); > for (int ijoint=0; ijoint<njoint; ijoint++) > { >- int distant; >+ med_2_3::med_int distant; > char joint_description[MED_TAILLE_DESC]; > char name[MED_TAILLE_NOM]; > char name_distant[MED_TAILLE_NOM]; >@@ -204,7 +204,7 @@ > &cor_typent_local, &cor_typgeo_local, > &cor_typent_dist, &cor_typgeo_dist > ); >- int* node_corresp=new int[ncouples]; >+ med_2_3::med_int* node_corresp=new med_2_3::med_int[ncouples]; > if (cor_typent_local == med_2_3::MED_NOEUD && cor_typent_dist == med_2_3::MED_NOEUD) > { > >@@ -222,7 +222,7 @@ > cz->setDistantDomainNumber(distant); > cz->setLocalMesh((m_collection->getMesh())[idomain]); > cz->setDistantMesh((m_collection->getMesh())[distant]); >- cz->setNodeCorresp(node_corresp,ncouples); >+ cz->setNodeCorresp((int *)node_corresp,ncouples); > (m_collection->getCZ()).push_back(cz); > > }//loop on correspom_topology->nbDomain())ndances >@@ -233,7 +233,7 @@ > int ncell=(m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,MED_EN::MED_ALL_ELEMENTS); > if (ncell>0) > { >- int * array=new int[ncell]; >+ med_2_3::med_int * array=new med_2_3::med_int[ncell]; > int offset=0; > MESSAGE("Reading cell global numbering for mesh "<< idomain); > list<MED_EN::medGeometryElement>::const_iterator iter; >@@ -251,24 +251,24 @@ > med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); > offset+=ntype; > } >- cellglobal[idomain]=array; >+ cellglobal[idomain]=(int *)array; > delete[] types; > } > > MESSAGE("Reading node global numbering"); > int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes(); > { >- int* array=new int[nnode]; >+ med_2_3::med_int* array=new med_2_3::med_int[nnode]; > med_2_3::MEDglobalNumLire(fid,meshname, array, nnode, > med_2_3::MED_NOEUD, med_2_3::MED_POINT1); >- nodeglobal[idomain]=array; >+ nodeglobal[idomain]=(int *)array; > } > > MESSAGE("Reading face global numbering for mesh "<<idomain); > int nbface=(m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,MED_EN::MED_ALL_ELEMENTS); > if (nbface!=0) > { >- int* array=new int[nbface]; >+ med_2_3::med_int* array=new med_2_3::med_int[nbface]; > int offset=0; > int nbtypes = (m_collection->getMesh())[idomain]->getNumberOfTypesWithPoly(MED_EN::MED_FACE); > MED_EN::medGeometryElement* types =(m_collection->getMesh())[idomain]->getTypesWithPoly(MED_EN::MED_FACE); >@@ -284,7 +284,7 @@ > med_2_3::MED_FACE, (med_2_3::med_geometrie_element)type); > offset+=ntype; > } >- faceglobal[idomain]=array; >+ faceglobal[idomain]=(int *)array; > delete[] types; > } > med_2_3::MEDfermer(fid); >@@ -346,7 +346,7 @@ > jointSort(node_corresp, nbnodes, false); > > error= >- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes, >+ med_2_3::MEDjointEcr(fid, mesh_name, joint_name,(med_2_3::med_int *) node_corresp, nbnodes, > med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1); > if (error==-1) cout << "erreur creation de joint "<<endl; > >@@ -366,8 +366,8 @@ > // Writing cell global numbering > // > int ncell=m_collection->getTopology()->getCellNumber(idomain); >- int * array=new int[ncell]; >- m_collection->getTopology()->getCellList(idomain,array); >+ med_2_3::med_int * array=new med_2_3::med_int[ncell]; >+ m_collection->getTopology()->getCellList(idomain,(int *)array); > int offset=0; > > MED_EN::MESH_ENTITIES::const_iterator currentEntity; >@@ -404,8 +404,8 @@ > offset=0; > int nface= m_collection->getTopology()->getFaceNumber(idomain); > if (nface >0) >- array=new int[nface]; >- m_collection->getTopology()->getFaceList(idomain,array); >+ array=new med_2_3::med_int[nface]; >+ m_collection->getTopology()->getFaceList(idomain,(int *)array); > strcpy(meshchar,(m_collection->getMesh())[idomain]->getName().c_str()); > int nbfacetypes = (m_collection->getMesh())[idomain]->getNumberOfTypesWithPoly(constituent_entity); > MED_EN::medGeometryElement* facetypes; >@@ -429,8 +429,8 @@ > //writing node global numbering > > int nnode= m_collection->getTopology()->getNodeNumber(idomain); >- array=new int[nnode]; >- m_collection->getTopology()->getNodeList(idomain,array); >+ array=new med_2_3::med_int[nnode]; >+ m_collection->getTopology()->getNodeList(idomain,(int *)array); > med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode, > med_2_3::MED_NOEUD, med_2_3::MED_POINT1); > >@@ -500,7 +500,7 @@ > for (iter= cellmap.begin(); iter != cellmap.end(); iter++) > { > int size= iter->second.size(); >- int *corresp = new int[size]; >+ med_2_3::med_int *corresp = new med_2_3::med_int[size]; > for (int ind=0; ind < size; ind++) > corresp[ind]=(iter->second)[ind]; > med_2_3::med_geometrie_element local_geo_elem=(med_2_3::med_geometrie_element)iter->first.first; >diff -aur src4.1.4.old/MED_SRC_4.1.4/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx src4.1.4/MED_SRC_4.1.4/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx >--- src4.1.4.old/MED_SRC_4.1.4/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2009-01-14 00:43:54.000000000 +0100 >+++ src4.1.4/MED_SRC_4.1.4/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2009-02-27 00:57:35.000000000 +0100 >@@ -312,13 +312,13 @@ > char desc1[MED_TAILLE_DESC]; > char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; > char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; >- int dom1, dom2; >+ med_2_3::med_int dom1, dom2; > med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); > med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); > CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0); > CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0); >- CPPUNIT_ASSERT_EQUAL(dom1,1); >- CPPUNIT_ASSERT_EQUAL(dom2,0); >+ CPPUNIT_ASSERT_EQUAL((int)dom1,1); >+ CPPUNIT_ASSERT_EQUAL((int)dom2,0); > > // testing node-node correspondency > med_2_3::med_entite_maillage typ_ent_loc=med_2_3::MED_NOEUD; >@@ -482,11 +482,11 @@ > char desc1[MED_TAILLE_DESC]; > char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; > char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; >- int dom1, dom2; >+ med_2_3::med_int dom1, dom2; > med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); > med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); >- CPPUNIT_ASSERT_EQUAL(dom1,1); >- CPPUNIT_ASSERT_EQUAL(dom2,0); >+ CPPUNIT_ASSERT_EQUAL(((int)dom1),1); >+ CPPUNIT_ASSERT_EQUAL(((int)dom2),0); > > // testing node-node correspondency > med_2_3::med_entite_maillage typ_ent_loc=med_2_3::MED_NOEUD; >@@ -564,7 +564,7 @@ > //testing cells global numbering > num = new med_2_3::med_int[2]; > MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc); >- med_2_3::med_int* globcellref = new int[2]; >+ med_2_3::med_int* globcellref = new med_2_3::med_int[2]; > globcellref[0]=1; > globcellref[1]=3; > >@@ -798,8 +798,8 @@ > med_2_3::med_int dom1, dom2; > med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); > med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); >- CPPUNIT_ASSERT_EQUAL(dom1,1); >- CPPUNIT_ASSERT_EQUAL(dom2,0); >+ CPPUNIT_ASSERT_EQUAL(((int)dom1),1); >+ CPPUNIT_ASSERT_EQUAL(((int)dom2),0); > > // testing node-node correspondency > med_2_3::med_entite_maillage typ_ent_loc=med_2_3::MED_NOEUD; >@@ -1176,11 +1176,11 @@ > char desc1[MED_TAILLE_DESC+1]; > char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1]; > char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1]; >- int dom1, dom2; >+ med_2_3::med_int dom1, dom2; > med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); > med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); >- CPPUNIT_ASSERT_EQUAL(dom1,1); >- CPPUNIT_ASSERT_EQUAL(dom2,0); >+ CPPUNIT_ASSERT_EQUAL(((int)dom1),1); >+ CPPUNIT_ASSERT_EQUAL(((int)dom2),0); > > > int nbEdgesFamilies1= med_2_3::MEDnFam(fid1, meshname1);
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