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; ijointsetDistantDomainNumber(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::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 "<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 "<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);