Merge branch 'V9_2_BR'

[tools/medcoupling.git] / src / MEDCoupling / Test / MEDCouplingBasicsTest1.cxx

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
index 01b7b4906a7ba9b5f21e221ca652cc7531e51188..99abe4394994778fa51f475a6dffebe686d2898c 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
@@ -23,8 +23,6 @@
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
-
 #include <sstream>
 #include <cmath>
 #include <algorithm>
@@ -38,7 +36,7 @@ void MEDCouplingBasicsTest1::testArray()
   const int tmp2[3]={8,9,10};
   {
     MemArray<int> mem;
-    mem.useArray(tmp1,false,CPP_DEALLOC,6);
+    mem.useArray(tmp1,false,DeallocType::CPP_DEALLOC,6);
     CPPUNIT_ASSERT(tmp1==mem.getConstPointer());
     CPPUNIT_ASSERT_THROW(mem.getPointer(),INTERP_KERNEL::Exception);
     CPPUNIT_ASSERT_THROW(mem[2]=7,INTERP_KERNEL::Exception);
@@ -49,7 +47,7 @@ void MEDCouplingBasicsTest1::testArray()
     int *tmp3=new int[6];
     std::copy(tmp1,tmp1+6,tmp3);
     MemArray<int> mem2;
-    mem2.useArray(tmp3,true,CPP_DEALLOC,6);
+    mem2.useArray(tmp3,true,DeallocType::CPP_DEALLOC,6);
     CPPUNIT_ASSERT(tmp3==mem2.getConstPointer());
     CPPUNIT_ASSERT(tmp3==mem2.getPointer());
     CPPUNIT_ASSERT_EQUAL(5,mem2[2]);
@@ -73,11 +71,9 @@ void MEDCouplingBasicsTest1::testArray2()
   arr->setInfoOnComponent(1,"hhhh");
   arr->setInfoOnComponent(2,"jj");
   arr->setInfoOnComponent(3,"kkkkkk");
-  DataArrayInt *arr2=arr->convertToIntArr();
-  DataArrayDouble *arr3=arr2->convertToDblArr();
-  arr2->decrRef();
+  MCAuto<DataArrayInt> arr2(arr->convertToIntArr());
+  MCAuto<DataArrayDouble> arr3(arr2->convertToDblArr());
   CPPUNIT_ASSERT(arr->isEqual(*arr3,1e-14));
-  arr3->decrRef();
   arr->decrRef();
 }
 
@@ -162,29 +158,29 @@ void MEDCouplingBasicsTest1::testMesh()
     mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,curConn);
   mesh->finishInsertingCells();
   CPPUNIT_ASSERT_EQUAL((std::size_t)30,mesh->getNodalConnectivity()->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(nbOfCells,(int)mesh->getNumberOfCells());
   //test 0 - no copy no ownership
   DataArrayDouble *myCoords=DataArrayDouble::New();
-  myCoords->useArray(coords,false,CPP_DEALLOC,nbOfNodes,3);
+  myCoords->useArray(coords,false,DeallocType::CPP_DEALLOC,nbOfNodes,3);
   mesh->setCoords(myCoords);
   mesh->setCoords(myCoords);
   myCoords->decrRef();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(nbOfCells,(int)mesh->getNumberOfCells());
   mesh->checkConsistencyLight();
   //test 1 - no copy ownership C++
   myCoords=DataArrayDouble::New();
   double *tmp=new double[3*nbOfNodes];
   std::copy(coords,coords+3*nbOfNodes,tmp);
-  myCoords->useArray(tmp,true,CPP_DEALLOC,nbOfNodes,3);
+  myCoords->useArray(tmp,true,DeallocType::CPP_DEALLOC,nbOfNodes,3);
   mesh->setCoords(myCoords);
   myCoords->decrRef();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(nbOfCells,(int)mesh->getNumberOfCells());
   mesh->checkConsistencyLight();
   //test 2 - no copy ownership C
   myCoords=DataArrayDouble::New();
   tmp=(double *)malloc(3*nbOfNodes*sizeof(double));
   std::copy(coords,coords+3*nbOfNodes,tmp);
-  myCoords->useArray(tmp,true,C_DEALLOC,nbOfNodes,3);
+  myCoords->useArray(tmp,true,DeallocType::C_DEALLOC,nbOfNodes,3);
   mesh->setCoords(myCoords);
   myCoords->decrRef();
   CPPUNIT_ASSERT_EQUAL(nbOfNodes,mesh->getNumberOfNodes());
@@ -208,7 +204,7 @@ void MEDCouplingBasicsTest1::testMesh()
   MEDCouplingUMesh *mesh2=mesh->clone(false);
   CPPUNIT_ASSERT(mesh2!=mesh);
   mesh2->checkConsistencyLight();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh2->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(nbOfCells,(int)mesh2->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(nbOfNodes,mesh2->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(3,mesh2->getSpaceDimension());
   CPPUNIT_ASSERT(mesh!=mesh2);
@@ -223,7 +219,7 @@ void MEDCouplingBasicsTest1::testMesh()
   MEDCouplingUMesh *mesh3=mesh->clone(true);
   CPPUNIT_ASSERT(mesh3!=mesh);
   mesh3->checkConsistencyLight();
-  CPPUNIT_ASSERT_EQUAL(nbOfCells,mesh3->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(nbOfCells,(int)mesh3->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(nbOfNodes,mesh3->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(3,mesh3->getSpaceDimension());
   CPPUNIT_ASSERT(mesh!=mesh3);
@@ -297,7 +293,7 @@ void MEDCouplingBasicsTest1::testMeshPointsCloud()
   //
   targetMesh->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(3,targetMesh->getSpaceDimension());
-  CPPUNIT_ASSERT_EQUAL(8,targetMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(8,(int)targetMesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(9,targetMesh->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(0,targetMesh->getMeshDimension());
   //
@@ -316,7 +312,7 @@ void MEDCouplingBasicsTest1::testMeshM1D()
   meshM1D->setMeshDimension(-1);
   meshM1D->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(-1,meshM1D->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(1,meshM1D->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(1,(int)meshM1D->getNumberOfCells());
   CPPUNIT_ASSERT_THROW(meshM1D->getNumberOfNodes(),INTERP_KERNEL::Exception);
   CPPUNIT_ASSERT_THROW(meshM1D->getSpaceDimension(),INTERP_KERNEL::Exception);
   MEDCouplingUMesh *cpy=meshM1D->clone(true);
@@ -391,7 +387,7 @@ void MEDCouplingBasicsTest1::testConvertToPolyTypes()
   std::vector<int> eltsV(elts,elts+2);
   mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size());
   mesh->checkConsistencyLight();
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(5,(int)mesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(23,(int)mesh->getNodalConnectivity()->getNumberOfTuples());
   const int *pt=mesh->getNodalConnectivity()->getConstPointer();
   const int expected1[23]={4, 0, 3, 4, 1, 5, 1, 4, 2, 3, 4, 5, 2, 5, 6, 7, 4, 3, 4, 7, 8, 5, 4};
@@ -402,11 +398,11 @@ void MEDCouplingBasicsTest1::testConvertToPolyTypes()
   mesh=build3DTargetMesh_1();
   mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size());
   mesh->checkConsistencyLight();
-  CPPUNIT_ASSERT_EQUAL(8,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(8,(int)mesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(114,(int)mesh->getNodalConnectivity()->getNumberOfTuples());
   mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size());
   mesh->checkConsistencyLight();
-  CPPUNIT_ASSERT_EQUAL(8,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(8,(int)mesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(114,(int)mesh->getNodalConnectivity()->getNumberOfTuples());
   //
   mesh->decrRef();
@@ -423,7 +419,7 @@ void MEDCouplingBasicsTest1::testDescConn2D()
   MEDCouplingUMesh *mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
   mesh2->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(1,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(13,mesh2->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(13,(int)mesh2->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL((std::size_t)14,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(14,(int)revDescIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)6,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(6,(int)descIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)18,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(18,(int)desc->getNumberOfTuples());
@@ -462,7 +458,7 @@ void MEDCouplingBasicsTest1::testDescConn2D()
   mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
   mesh2->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(1,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(13,mesh2->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(13,(int)mesh2->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL((std::size_t)14,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(14,(int)revDescIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)6,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(6,(int)descIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)18,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(18,(int)desc->getNumberOfTuples());
@@ -495,7 +491,7 @@ void MEDCouplingBasicsTest1::testDescConn3D()
   MEDCouplingUMesh *mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
   mesh2->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(2,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(36,mesh2->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(36,(int)mesh2->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL((std::size_t)37,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(37,(int)revDescIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)9,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(9,(int)descIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)48,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(48,(int)desc->getNumberOfTuples());
@@ -538,7 +534,7 @@ void MEDCouplingBasicsTest1::testDescConn3D()
   mesh2=mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
   mesh2->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(2,mesh2->getMeshDimension());
-  CPPUNIT_ASSERT_EQUAL(36,mesh2->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(36,(int)mesh2->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL((std::size_t)37,revDescIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(37,(int)revDescIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)9,descIndx->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(9,(int)descIndx->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL((std::size_t)48,desc->getNbOfElems()); CPPUNIT_ASSERT_EQUAL(48,(int)desc->getNumberOfTuples());
@@ -574,7 +570,7 @@ void MEDCouplingBasicsTest1::testBoundaryMesh()
 {
   MEDCouplingUMesh *mesh=build3DTargetMesh_1();
   MEDCouplingPointSet *mesh2=mesh->buildBoundaryMesh(false);
-  CPPUNIT_ASSERT_EQUAL(24,mesh2->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(24,(int)mesh2->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(26,mesh2->getNumberOfNodes());
   mesh2->decrRef();
   mesh->decrRef();
@@ -598,7 +594,7 @@ void MEDCouplingBasicsTest1::testBuildPartOfMySelf()
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllGeoTypes().begin());
   CPPUNIT_ASSERT(name=="Toto");
   CPPUNIT_ASSERT(mesh->getCoords()==subMesh->getCoords());
-  CPPUNIT_ASSERT_EQUAL(2,subMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getNumberOfCells());
   const int subConn[10]={4,0,3,4,1,4,7,8,5,4};
   const int subConnIndex[3]={0,5,10};
   CPPUNIT_ASSERT_EQUAL((std::size_t)10,subMesh->getNodalConnectivity()->getNbOfElems());
@@ -616,7 +612,7 @@ void MEDCouplingBasicsTest1::testBuildPartOfMySelf()
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*(++(subMesh->getAllGeoTypes().begin())));
   CPPUNIT_ASSERT(name=="Toto");
   CPPUNIT_ASSERT(mesh->getCoords()==subMesh->getCoords());
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)subMesh->getNumberOfCells());
   const int subConn2[14]={4,0,3,4,1,3,4,5,2,4,6,7,4,3};
   const int subConnIndex2[4]={0,5,9,14};
   CPPUNIT_ASSERT_EQUAL((std::size_t)14,subMesh->getNodalConnectivity()->getNbOfElems());
@@ -642,7 +638,7 @@ void MEDCouplingBasicsTest1::testBuildPartOfMySelfNode()
   CPPUNIT_ASSERT(subMesh);
   CPPUNIT_ASSERT_EQUAL(1,(int)subMesh->getAllGeoTypes().size());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllGeoTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(1,subMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(1,(int)subMesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL((std::size_t)5,subMesh->getNodalConnectivity()->getNbOfElems());
   CPPUNIT_ASSERT_EQUAL((std::size_t)2,subMesh->getNodalConnectivityIndex()->getNbOfElems());
   const int subConn[5]={4,7,8,5,4};
@@ -658,7 +654,7 @@ void MEDCouplingBasicsTest1::testBuildPartOfMySelfNode()
   CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getAllGeoTypes().size());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*subMesh->getAllGeoTypes().begin());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*(++subMesh->getAllGeoTypes().begin()));
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)subMesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL((std::size_t)14,subMesh->getNodalConnectivity()->getNbOfElems());
   CPPUNIT_ASSERT_EQUAL((std::size_t)4,subMesh->getNodalConnectivityIndex()->getNbOfElems());
   const int subConn2[14]={3,4,5,2,4,6,7,4,3,4,7,8,5,4};
@@ -675,7 +671,7 @@ void MEDCouplingBasicsTest1::testBuildPartOfMySelfNode()
   CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getAllGeoTypes().size());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*subMesh->getAllGeoTypes().begin());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*(++subMesh->getAllGeoTypes().begin()));
-  CPPUNIT_ASSERT_EQUAL(3,subMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)subMesh->getNumberOfCells());
   subMeshSimple->decrRef();
   //
   mesh->decrRef();
@@ -687,7 +683,7 @@ void MEDCouplingBasicsTest1::testZipCoords()
   CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllGeoTypes().size());
   CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(9,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(5,(int)mesh->getNumberOfCells());
   std::vector<int> oldConn(mesh->getNodalConnectivity()->getNbOfElems());
   std::vector<int> oldConnIndex(mesh->getNumberOfCells()+1);
   std::copy(mesh->getNodalConnectivity()->getPointer(),mesh->getNodalConnectivity()->getPointer()+oldConn.size(),oldConn.begin());
@@ -698,7 +694,7 @@ void MEDCouplingBasicsTest1::testZipCoords()
   CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllGeoTypes().size());
   CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(9,mesh->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(5,mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(5,(int)mesh->getNumberOfCells());
   CPPUNIT_ASSERT(mesh->getCoords()!=oldCoords);
   CPPUNIT_ASSERT(std::equal(mesh->getCoords()->getPointer(),mesh->getCoords()->getPointer()+2*9,oldCoords->getPointer()));
   CPPUNIT_ASSERT(std::equal(oldConn.begin(),oldConn.end(),mesh->getNodalConnectivity()->getPointer()));
@@ -714,7 +710,7 @@ void MEDCouplingBasicsTest1::testZipCoords()
   CPPUNIT_ASSERT(std::equal(expectedTraducer,expectedTraducer+9,traducer->getPointer()));
   traducer->decrRef();
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllGeoTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(2,subMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getNumberOfCells());
   const int subConn[10]={4,0,2,3,1,4,5,6,4,3};
   const int subConnIndex[3]={0,5,10};
   CPPUNIT_ASSERT_EQUAL(7,subMesh->getNumberOfNodes());
@@ -728,7 +724,7 @@ void MEDCouplingBasicsTest1::testZipCoords()
   subMesh=dynamic_cast<MEDCouplingUMesh *>(subMeshPtSet);
   CPPUNIT_ASSERT(subMesh);
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_QUAD4,*subMesh->getAllGeoTypes().begin());
-  CPPUNIT_ASSERT_EQUAL(2,subMesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(2,(int)subMesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(7,subMesh->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL((std::size_t)10,subMesh->getNodalConnectivity()->getNbOfElems());
   CPPUNIT_ASSERT_EQUAL((std::size_t)3,subMesh->getNodalConnectivityIndex()->getNbOfElems());
@@ -758,22 +754,22 @@ void MEDCouplingBasicsTest1::testZipConnectivity()
   //
   bool areNodesMerged;
   int newNbOfNodes;
-  CPPUNIT_ASSERT_EQUAL(10,m6->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(10,(int)m6->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(22,m6->getNumberOfNodes());
   DataArrayInt *arr=m6->mergeNodes(1e-13,areNodesMerged,newNbOfNodes);
   arr->decrRef();
   CPPUNIT_ASSERT(areNodesMerged);
-  CPPUNIT_ASSERT_EQUAL(10,m6->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(10,(int)m6->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(9,m6->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(9,newNbOfNodes);
   //
   arr=m6->zipConnectivityTraducer(0);
-  CPPUNIT_ASSERT_EQUAL(7,m6->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(7,(int)m6->getNumberOfCells());
   arr->decrRef();
   MEDCouplingUMesh *m7=m6->clone(true);
   arr=m6->zipConnectivityTraducer(0);
   CPPUNIT_ASSERT(m7->isEqual(m6,1e-12));
-  CPPUNIT_ASSERT_EQUAL(7,m6->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(7,(int)m6->getNumberOfCells());
   arr->decrRef();
   //
   m7->decrRef();
@@ -948,7 +944,7 @@ void MEDCouplingBasicsTest1::testBuildSubMeshData()
   const int elts[3]={1,2,4};
   DataArrayInt *di;
   MEDCouplingMesh *ret1=fieldCells->buildSubMeshData(elts,elts+3,di);
-  CPPUNIT_ASSERT_EQUAL(3,ret1->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)ret1->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(9,ret1->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(3,(int)di->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL(1,(int)di->getNumberOfComponents());
@@ -965,7 +961,7 @@ void MEDCouplingBasicsTest1::testBuildSubMeshData()
   MEDCouplingMesh *ret2=fieldNodes->buildSubMeshData(elts,elts+3,di);
   MEDCouplingUMesh *ret2DC=dynamic_cast<MEDCouplingUMesh *>(ret2);
   CPPUNIT_ASSERT(ret2DC);
-  CPPUNIT_ASSERT_EQUAL(3,ret2->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)ret2->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(6,ret2->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(6,(int)di->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL(1,(int)di->getNumberOfComponents());
@@ -983,7 +979,7 @@ void MEDCouplingBasicsTest1::testExtrudedMesh1()
   MEDCouplingUMesh *mesh2D=0;
   MEDCouplingUMesh *mesh3D=build3DExtrudedUMesh_1(mesh2D);
   MEDCouplingMappedExtrudedMesh *ext=MEDCouplingMappedExtrudedMesh::New(mesh3D,mesh2D,1);
-  CPPUNIT_ASSERT_EQUAL(18,ext->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(18,(int)ext->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(60,ext->getNumberOfNodes());
   DataArrayInt *ids3D=ext->getMesh3DIds();
   const int ids3DExpected[18]={5,4,3,2,1,0, 11,10,9,8,7,6, 17,16,15,14,13,12};
@@ -992,7 +988,7 @@ void MEDCouplingBasicsTest1::testExtrudedMesh1()
   CPPUNIT_ASSERT(std::equal(ids3DExpected,ids3DExpected+18,ids3D->getConstPointer()));
   MEDCouplingUMesh *mesh1D=ext->getMesh1D();
   CPPUNIT_ASSERT_EQUAL(4,mesh1D->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(3,mesh1D->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)mesh1D->getNumberOfCells());
   const double mesh1DExpected[12]={0.66666666666666663, 1.4583333333333333, 0, 0.66666666666666663, 1.4583333333333333, 1, 0.66666666666666663, 1.4583333333333333, 2, 0.66666666666666663, 1.4583333333333333, 3};
   DataArrayDouble *mesh1DCoords=mesh1D->getCoords();
   CPPUNIT_ASSERT_EQUAL(4,(int)mesh1DCoords->getNumberOfTuples());
@@ -1025,9 +1021,9 @@ void MEDCouplingBasicsTest1::testExtrudedMesh2()
   CPPUNIT_ASSERT_EQUAL(43,(int)n.size());
   MEDCouplingUMesh *mTT3dSurf=(MEDCouplingUMesh *)mTT->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
   MEDCouplingMappedExtrudedMesh *meTT=MEDCouplingMappedExtrudedMesh::New(mTT,mTT3dSurf,0);
-  CPPUNIT_ASSERT_EQUAL(200,meTT->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(10,meTT->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(20,meTT->getMesh1D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(200,(int)meTT->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(10,(int)meTT->getMesh2D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(20,(int)meTT->getMesh1D()->getNumberOfCells());
   mTT3dSurf->decrRef();
   //
   b=false;
@@ -1039,9 +1035,9 @@ void MEDCouplingBasicsTest1::testExtrudedMesh2()
   CPPUNIT_ASSERT_EQUAL(30,(int)n.size());
   MEDCouplingUMesh *mN3dSurf=(MEDCouplingUMesh *)mN->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
   MEDCouplingMappedExtrudedMesh *meN=MEDCouplingMappedExtrudedMesh::New(mN,mN3dSurf,0);
-  CPPUNIT_ASSERT_EQUAL(40,meN->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(20,meN->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(2,meN->getMesh1D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(40,(int)meN->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(20,(int)meN->getMesh2D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(2,(int)meN->getMesh1D()->getNumberOfCells());
   mN3dSurf->decrRef();
   //
   b=false;
@@ -1053,9 +1049,9 @@ void MEDCouplingBasicsTest1::testExtrudedMesh2()
   CPPUNIT_ASSERT_EQUAL(27,(int)n.size());
   MEDCouplingUMesh *mTF3dSurf=(MEDCouplingUMesh *)mTF->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
   MEDCouplingMappedExtrudedMesh *meTF=MEDCouplingMappedExtrudedMesh::New(mTF,mTF3dSurf,0);
-  CPPUNIT_ASSERT_EQUAL(340,meTF->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(17,meTF->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(20,meTF->getMesh1D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(340,(int)meTF->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(17,(int)meTF->getMesh2D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(20,(int)meTF->getMesh1D()->getNumberOfCells());
   mTF3dSurf->decrRef();
   //
   meTT->decrRef();
@@ -1082,9 +1078,9 @@ void MEDCouplingBasicsTest1::testExtrudedMesh3()
   MEDCouplingUMesh *m3=m1->buildExtrudedMesh(m2,0);
   //
   MEDCouplingMappedExtrudedMesh *m4=MEDCouplingMappedExtrudedMesh::New(m3,m1,0);
-  CPPUNIT_ASSERT_EQUAL(15,m4->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(5,m4->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(3,m4->getMesh1D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(15,(int)m4->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(5,(int)m4->getMesh2D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)m4->getMesh1D()->getNumberOfCells());
   const int *m3DIds=m4->getMesh3DIds()->getConstPointer();
   for(int i=0;i<15;i++)
     CPPUNIT_ASSERT_EQUAL(i,m3DIds[i]);
@@ -1093,9 +1089,9 @@ void MEDCouplingBasicsTest1::testExtrudedMesh3()
   const int expected1[15]={1,3,2,0,6,5,7,10,11,8,12,9,14,13,4};
   m3->renumberCells(expected1,false);
   m4=MEDCouplingMappedExtrudedMesh::New(m3,m1,0);
-  CPPUNIT_ASSERT_EQUAL(15,m4->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(5,m4->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(3,m4->getMesh1D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(15,(int)m4->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(5,(int)m4->getMesh2D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)m4->getMesh1D()->getNumberOfCells());
   m3DIds=m4->getMesh3DIds()->getConstPointer();
   for(int i=0;i<15;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],m3DIds[i]);
@@ -1112,9 +1108,9 @@ void MEDCouplingBasicsTest1::testExtrudedMesh3()
   CPPUNIT_ASSERT_EQUAL((int)INTERP_KERNEL::NORM_HEXA8,(int)m3->getTypeOfCell(4));
   m3->renumberCells(expected1,false);
   m4=MEDCouplingMappedExtrudedMesh::New(m3,m1,0);
-  CPPUNIT_ASSERT_EQUAL(15,m4->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(5,m4->getMesh2D()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(3,m4->getMesh1D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(15,(int)m4->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(5,(int)m4->getMesh2D()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(3,(int)m4->getMesh1D()->getNumberOfCells());
   m3DIds=m4->getMesh3DIds()->getConstPointer();
   for(int i=0;i<15;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],m3DIds[i]);
@@ -1181,12 +1177,12 @@ void MEDCouplingBasicsTest1::testFindCommonNodes()
   DataArrayInt *comm,*commI;
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
   targetMesh->findCommonNodes(1e-10,-1,comm,commI);
-  CPPUNIT_ASSERT_EQUAL(1,commI->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(0,comm->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)commI->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(0,(int)comm->getNumberOfTuples());
   int newNbOfNodes;
   DataArrayInt *o2n=targetMesh->buildNewNumberingFromCommonNodesFormat(comm,commI,newNbOfNodes);
   CPPUNIT_ASSERT_EQUAL(27,newNbOfNodes);
-  CPPUNIT_ASSERT_EQUAL(27,o2n->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(27,(int)o2n->getNumberOfTuples());
   const int o2nExp1[27]=
     {
       0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
@@ -1201,14 +1197,14 @@ void MEDCouplingBasicsTest1::testFindCommonNodes()
   targetMesh=build3DTargetMeshMergeNode_1();
   CPPUNIT_ASSERT_EQUAL(31,targetMesh->getNumberOfNodes());
   targetMesh->findCommonNodes(1e-10,-1,comm,commI);
-  CPPUNIT_ASSERT_EQUAL(3,commI->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(6,comm->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(3,(int)commI->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(6,(int)comm->getNumberOfTuples());
   const int commExpected[6]={1,27,28,29,23,30};
   const int commIExpected[3]={0,4,6};
   CPPUNIT_ASSERT(std::equal(commExpected,commExpected+6,comm->getConstPointer()));
   CPPUNIT_ASSERT(std::equal(commIExpected,commIExpected+3,commI->getConstPointer()));
   o2n=targetMesh->buildNewNumberingFromCommonNodesFormat(comm,commI,newNbOfNodes);
-  CPPUNIT_ASSERT_EQUAL(31,o2n->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(31,(int)o2n->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL(27,newNbOfNodes);
   const int o2nExp2[31]=
     {
@@ -1241,9 +1237,9 @@ void MEDCouplingBasicsTest1::testFindCommonNodes()
                    18,4,5,8,7,13,14,17,16,
                    18,9,10,13,12,18,19,22,21, 18,10,11,14,13,19,20,23,22, 18,12,13,16,15,21,22,25,24,
                    18,13,14,17,16,22,23,26,25};
-  CPPUNIT_ASSERT_EQUAL(72,targetMesh->getNodalConnectivity()->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(72,(int)targetMesh->getNodalConnectivity()->getNumberOfTuples());
   CPPUNIT_ASSERT(std::equal(connExp,connExp+72,targetMesh->getNodalConnectivity()->getConstPointer()));
-  CPPUNIT_ASSERT_EQUAL(27,targetMesh->getCoords()->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(27,(int)targetMesh->getCoords()->getNumberOfTuples());
   double coordsExp[81]={ 0., 0., 0., 50., 0., 0. , 200., 0., 0.  , 0., 50., 0., 50., 50., 0. ,
                          200., 50., 0.,   0., 200., 0., 50., 200., 0. , 200., 200., 0. ,
                          0., 0., 50., 50., 0., 50. , 200., 0., 50.  , 0., 50., 50., 50.,
@@ -1263,10 +1259,10 @@ void MEDCouplingBasicsTest1::testFindCommonNodes()
   CPPUNIT_ASSERT(areNodesMerged);
   CPPUNIT_ASSERT_EQUAL(9,targetMesh->getNumberOfNodes());
   int connExp2[23]={4,0,4,3,1, 3,1,3,2, 3,3,5,2, 4,4,6,7,3, 4,7,8,5,3};
-  CPPUNIT_ASSERT_EQUAL(23,targetMesh->getNodalConnectivity()->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(23,(int)targetMesh->getNodalConnectivity()->getNumberOfTuples());
   CPPUNIT_ASSERT(std::equal(connExp2,connExp2+23,targetMesh->getNodalConnectivity()->getConstPointer()));
   double coordsExp2[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, 0.2,0.2, -0.3,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7};
-  CPPUNIT_ASSERT_EQUAL(9,targetMesh->getCoords()->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(9,(int)targetMesh->getCoords()->getNumberOfTuples());
   CPPUNIT_ASSERT(std::equal(coordsExp2,coordsExp2+18,targetMesh->getCoords()->getConstPointer()));
   targetMesh->decrRef();
   o2n->decrRef();
@@ -1345,7 +1341,7 @@ void MEDCouplingBasicsTest1::testMergeMeshOnSameCoords1()
   MEDCouplingUMesh *m4=MEDCouplingUMesh::MergeUMeshesOnSameCoords(meshes);
   m4->checkConsistencyLight();
   CPPUNIT_ASSERT(m4->getCoords()==m1->getCoords());
-  CPPUNIT_ASSERT_EQUAL(15,m4->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(15,(int)m4->getNumberOfCells());
   const int cells1[5]={0,1,2,3,4};
   MEDCouplingPointSet *m1_1=m4->buildPartOfMySelf(cells1,cells1+5,true);
   m1_1->setName(m1->getName().c_str());
@@ -1990,11 +1986,11 @@ void MEDCouplingBasicsTest1::testRearrange2ConsecutiveCellTypes()
   arr1->decrRef();
   const int expected2[5]={0,3,4,1,2};
   arr1=m2_1->rearrange2ConsecutiveCellTypes();
-  CPPUNIT_ASSERT_EQUAL(5,arr1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(5,(int)arr1->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL(1,(int)arr1->getNumberOfComponents());
   CPPUNIT_ASSERT(std::equal(expected2,expected2+5,arr1->getConstPointer()));
   MEDCouplingUMesh *m2_2=build2DTargetMesh_1();
-  CPPUNIT_ASSERT_EQUAL(5,arr1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(5,(int)arr1->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL(1,(int)arr1->getNumberOfComponents());
   CPPUNIT_ASSERT(std::equal(expected2,expected2+5,arr1->getConstPointer()));
   CPPUNIT_ASSERT(!m2_2->isEqual(m2_1,1e-12));
@@ -2045,7 +2041,7 @@ void MEDCouplingBasicsTest1::testFuseUMeshesOnSameCoords()
   //
   std::vector<DataArrayInt *> corr;
   MEDCouplingUMesh *m7=MEDCouplingUMesh::FuseUMeshesOnSameCoords(meshes,0,corr);
-  CPPUNIT_ASSERT_EQUAL(4,m7->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(4,(int)m7->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(3,(int)corr.size());
   const int expectedVals1[3]={3,3,2};
   const int expectedVals2[3][3]={{0,1,2},{3,0,2},{3,0,111111}};
@@ -2054,7 +2050,7 @@ void MEDCouplingBasicsTest1::testFuseUMeshesOnSameCoords()
       DataArrayInt *arr=corr[i];
       CPPUNIT_ASSERT_EQUAL(1,(int)arr->getNumberOfComponents());
       int nbOfVals=expectedVals1[i];
-      CPPUNIT_ASSERT_EQUAL(nbOfVals,arr->getNumberOfTuples());
+      CPPUNIT_ASSERT_EQUAL(nbOfVals,(int)arr->getNumberOfTuples());
       const int *vals=arr->getConstPointer();
       for(int j=0;j<nbOfVals;j++)
         CPPUNIT_ASSERT_EQUAL(expectedVals2[i][j],vals[j]);
@@ -2066,7 +2062,7 @@ void MEDCouplingBasicsTest1::testFuseUMeshesOnSameCoords()
   const int fidsGrp[3][3]={{1,3,5},{3,4,5},{4,5,23344}};
   CPPUNIT_ASSERT_EQUAL(3,(int)fidsOfGroups.size());
   CPPUNIT_ASSERT_EQUAL(1,(int)arr2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(4,arr2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(4,(int)arr2->getNumberOfTuples());
   CPPUNIT_ASSERT(std::equal(fidExp,fidExp+4,arr2->getConstPointer()));
   for(int i=0;i<3;i++)
     {
@@ -2100,7 +2096,7 @@ void MEDCouplingBasicsTest1::testFuseUMeshesOnSameCoords2()
   meshes.push_back(m4);
   std::vector<DataArrayInt *> corr;
   MEDCouplingUMesh *m5=MEDCouplingUMesh::FuseUMeshesOnSameCoords(meshes,0,corr);
-  CPPUNIT_ASSERT_EQUAL(18,m5->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(18,(int)m5->getNumberOfCells());
   std::vector<DataArrayInt *>::iterator it=corr.begin();
   const int exp1[4]={18,5,5,4};
   const int exp2[4][18]={
@@ -2288,13 +2284,13 @@ void MEDCouplingBasicsTest1::testCMesh0()
   
   DataArrayDouble* coordsX=DataArrayDouble::New();
   double arrX[4] = { -1., 1., 2., 4. };
-  coordsX->useArray(arrX,false, CPP_DEALLOC,4,1);
+  coordsX->useArray(arrX,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsY=DataArrayDouble::New();
   double arrY[4] = { -2., 2., 4., 8. };
-  coordsY->useArray(arrY,false, CPP_DEALLOC,4,1);
+  coordsY->useArray(arrY,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsZ=DataArrayDouble::New();
   double arrZ[4] = { -3., 3., 6., 12. };
-  coordsZ->useArray(arrZ,false, CPP_DEALLOC,4,1);
+  coordsZ->useArray(arrZ,false, DeallocType::CPP_DEALLOC,4,1);
   mesh->setCoords(coordsX,coordsY,coordsZ);
   coordsX->decrRef();
   coordsY->decrRef();
@@ -2357,37 +2353,37 @@ void MEDCouplingBasicsTest1::testCMesh1()
   mesh1=MEDCouplingCMesh::New();
   DataArrayDouble* coordsX1=DataArrayDouble::New();
   double arrX1[4] = { -1., 1., 2., 4. };
-  coordsX1->useArray(arrX1,false, CPP_DEALLOC,4,1);
+  coordsX1->useArray(arrX1,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsY1=DataArrayDouble::New();
   double arrY1[4] = { -2., 2., 4., 8. };
-  coordsY1->useArray(arrY1,false, CPP_DEALLOC,4,1);
+  coordsY1->useArray(arrY1,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsZ1=DataArrayDouble::New();
   double arrZ1[4] = { -3., 3., 6., 12. };
-  coordsZ1->useArray(arrZ1,false, CPP_DEALLOC,4,1);
+  coordsZ1->useArray(arrZ1,false, DeallocType::CPP_DEALLOC,4,1);
   mesh1->setCoords(coordsX1,coordsY1,coordsZ1);
   
   mesh2=MEDCouplingCMesh::New();
   DataArrayDouble* coordsX2=DataArrayDouble::New();
   double arrX2[4] = { -1., 1., 2., 4. };
-  coordsX2->useArray(arrX2,false, CPP_DEALLOC,4,1);
+  coordsX2->useArray(arrX2,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsY2=DataArrayDouble::New();
   double arrY2[4] = { -2., 2., 4., 8. };
-  coordsY2->useArray(arrY2,false, CPP_DEALLOC,4,1);
+  coordsY2->useArray(arrY2,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsZ2=DataArrayDouble::New();
   double arrZ2[4] = { -3., 3., 6., 12.+1e-6 };   //here is not equal
-  coordsZ2->useArray(arrZ2,false, CPP_DEALLOC,4,1);
+  coordsZ2->useArray(arrZ2,false, DeallocType::CPP_DEALLOC,4,1);
   mesh2->setCoords(coordsX2,coordsY2,coordsZ2);
   
   mesh3=MEDCouplingCMesh::New();
   DataArrayDouble* coordsX3=DataArrayDouble::New();
   double arrX3[1] = { -1.};
-  coordsX3->useArray(arrX3,false, CPP_DEALLOC,1,1);
+  coordsX3->useArray(arrX3,false, DeallocType::CPP_DEALLOC,1,1);
   DataArrayDouble* coordsY3=DataArrayDouble::New();
   double arrY3[1] = { -2.};
-  coordsY3->useArray(arrY3,false, CPP_DEALLOC,1,1);
+  coordsY3->useArray(arrY3,false, DeallocType::CPP_DEALLOC,1,1);
   DataArrayDouble* coordsZ3=DataArrayDouble::New();
   double arrZ3[1] = { -3.};
-  coordsZ3->useArray(arrZ3,false, CPP_DEALLOC,1,1);
+  coordsZ3->useArray(arrZ3,false, DeallocType::CPP_DEALLOC,1,1);
   mesh3->setCoords(coordsX3,coordsY3,coordsZ3);
   
   CPPUNIT_ASSERT_EQUAL(3,mesh1->getSpaceDimension());
@@ -2404,7 +2400,7 @@ void MEDCouplingBasicsTest1::testCMesh1()
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh1->getTypeOfCell(1));
   
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,*((mesh1->getAllGeoTypes()).begin()));
-  CPPUNIT_ASSERT_EQUAL(27,mesh1->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
+  CPPUNIT_ASSERT_EQUAL(27,(int)mesh1->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
   CPPUNIT_ASSERT_THROW(mesh1->getNumberOfCellsWithType(INTERP_KERNEL::NORM_QUAD4),INTERP_KERNEL::Exception);
   
   std::vector<double> coo;
@@ -2447,13 +2443,13 @@ void MEDCouplingBasicsTest1::testCMesh2()
   mesh1=MEDCouplingCMesh::New();
   DataArrayDouble* coordsX1=DataArrayDouble::New();
   double arrX1[4] = { -1., 1., 2., 4. };
-  coordsX1->useArray(arrX1,false, CPP_DEALLOC,4,1);
+  coordsX1->useArray(arrX1,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsY1=DataArrayDouble::New();
   double arrY1[4] = { -2., 2., 4., 8. };
-  coordsY1->useArray(arrY1,false, CPP_DEALLOC,4,1);
+  coordsY1->useArray(arrY1,false, DeallocType::CPP_DEALLOC,4,1);
   DataArrayDouble* coordsZ1=DataArrayDouble::New();
   double arrZ1[4] = { -3., 3., 6., 12. };
-  coordsZ1->useArray(arrZ1,false, CPP_DEALLOC,4,1);
+  coordsZ1->useArray(arrZ1,false, DeallocType::CPP_DEALLOC,4,1);
   mesh1->setCoords(coordsX1,coordsY1,coordsZ1);
   
   std::vector<int> dis=mesh1->getDistributionOfTypes();
@@ -2500,7 +2496,7 @@ void MEDCouplingBasicsTest1::testCMesh2()
   MEDCouplingUMesh *partMesh1=
     dynamic_cast<MEDCouplingUMesh *>(mesh1->buildPart(cells1,cells1+4));
   CPPUNIT_ASSERT(partMesh1);
-  CPPUNIT_ASSERT_EQUAL(4,partMesh1->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
+  CPPUNIT_ASSERT_EQUAL(4,(int)partMesh1->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
   CPPUNIT_ASSERT_EQUAL(64,mesh1->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(64,partMesh1->getNumberOfNodes());
   
@@ -2509,7 +2505,7 @@ void MEDCouplingBasicsTest1::testCMesh2()
   MEDCouplingCMesh *partMesh2=
     dynamic_cast<MEDCouplingCMesh *>(mesh1->buildPartAndReduceNodes(cells2,cells2+2,arr1));
   CPPUNIT_ASSERT(partMesh2);
-  CPPUNIT_ASSERT_EQUAL(2,partMesh2->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
+  CPPUNIT_ASSERT_EQUAL(2,(int)partMesh2->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
   CPPUNIT_ASSERT_EQUAL(12,partMesh2->getNumberOfNodes());
   
   int cells3[2]={2,3};
@@ -2517,7 +2513,7 @@ void MEDCouplingBasicsTest1::testCMesh2()
   MEDCouplingUMesh *partMesh3=
     dynamic_cast<MEDCouplingUMesh *>(partMesh1->buildPartAndReduceNodes(cells3,cells3+2,arr2));
   CPPUNIT_ASSERT(partMesh3);
-  CPPUNIT_ASSERT_EQUAL(2,partMesh3->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
+  CPPUNIT_ASSERT_EQUAL(2,(int)partMesh3->getNumberOfCellsWithType(INTERP_KERNEL::NORM_HEXA8));
   CPPUNIT_ASSERT_EQUAL(12,partMesh3->getNumberOfNodes());
   
   CPPUNIT_ASSERT_THROW(mesh1->simplexize(0),INTERP_KERNEL::Exception);
@@ -2553,8 +2549,8 @@ void MEDCouplingBasicsTest1::testCMesh2()
   DataArrayInt* d1=DataArrayInt::New();
   DataArrayDouble* d2=DataArrayDouble::New();
   mesh2d->resizeForUnserialization(tinyInfo, d1, d2, littleStrings);
-  CPPUNIT_ASSERT_EQUAL(0,d1->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(8,d2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(0,(int)d1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(8,(int)d2->getNumberOfTuples());
  
   partMesh1->decrRef();
   partMesh2->decrRef();
@@ -2630,7 +2626,7 @@ void MEDCouplingBasicsTest1::testFindNodeOnPlane()
   MEDCouplingUMesh *m3dSurf=(MEDCouplingUMesh *)mesh->buildFacePartOfMySelfNode(&n[0],&n[0]+n.size(),true);
   MEDCouplingMappedExtrudedMesh *me=MEDCouplingMappedExtrudedMesh::New(mesh,m3dSurf,0);
   const DataArrayInt *da=me->getMesh3DIds();
-  CPPUNIT_ASSERT_EQUAL(8,me->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(8,(int)me->getNumberOfCells());
   const int expected[8]={0,1,2,3,4,5,6,7};
   const int *val=da->getConstPointer();
   for(int i=0;i<8;i++)