X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDLoader%2FParaMEDFileMesh.cxx;h=bb0dac70e6a063b4438739a7192e6776dea66215;hb=a988fcb09671c95bafbcba8cdcacf29e04ef5841;hp=6851b764b884a01e4354bbec65c61615f94831bb;hpb=c8d33262ed6d2041da8512b02f8c8b4ffadf733d;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDLoader/ParaMEDFileMesh.cxx b/src/ParaMEDLoader/ParaMEDFileMesh.cxx index 6851b764b..bb0dac70e 100644 --- a/src/ParaMEDLoader/ParaMEDFileMesh.cxx +++ b/src/ParaMEDLoader/ParaMEDFileMesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,7 @@ // Author : Anthony Geay (EDF R&D) #include "ParaMEDFileMesh.hxx" -#include "MEDCouplingAutoRefCountObjectPtr.hxx" +#include "MCAuto.hxx" #include "MEDFileMesh.hxx" #include "MEDFileMeshLL.hxx" #include "MEDLoader.hxx" @@ -87,7 +87,7 @@ MEDFileUMesh *ParaMEDFileUMesh::ParaNew(int iPart, int nbOfParts, const MPI_Comm MEDFileUMesh *ParaMEDFileUMesh::NewPrivate(med_idt fid, int iPart, int nbOfParts, const std::string& fileName, const std::string& mName, int dt, int it, MEDFileMeshReadSelector *mrs) { - MEDCouplingAutoRefCountObjectPtr ret; + MCAuto ret; int meshDim, spaceDim, numberOfNodes; std::vector< std::vector< std::pair > > typesDistrib(GetUMeshGlobalInfo(fileName,mName,meshDim,spaceDim,numberOfNodes)); std::vector types; @@ -108,10 +108,10 @@ MEDFileUMesh *ParaMEDFileUMesh::NewPrivate(med_idt fid, int iPart, int nbOfParts MEDFileMeshes *ParaMEDFileMeshes::New(int iPart, int nbOfParts, const std::string& fileName) { std::vector ms(GetMeshNames(fileName)); - MEDCouplingAutoRefCountObjectPtr ret(MEDFileMeshes::New()); + MCAuto ret(MEDFileMeshes::New()); for(std::vector::const_iterator it=ms.begin();it!=ms.end();it++) { - MEDCouplingAutoRefCountObjectPtr mesh(ParaMEDFileMesh::New(iPart,nbOfParts,fileName,(*it))); + MCAuto mesh(ParaMEDFileMesh::New(iPart,nbOfParts,fileName,(*it))); ret->pushMesh(mesh); } return ret.retn(); @@ -120,10 +120,10 @@ MEDFileMeshes *ParaMEDFileMeshes::New(int iPart, int nbOfParts, const std::strin MEDFileMeshes *ParaMEDFileMeshes::ParaNew(int iPart, int nbOfParts, const MPI_Comm& com, const MPI_Info& nfo, const std::string& fileName) { std::vector ms(GetMeshNames(fileName)); - MEDCouplingAutoRefCountObjectPtr ret(MEDFileMeshes::New()); + MCAuto ret(MEDFileMeshes::New()); for(std::vector::const_iterator it=ms.begin();it!=ms.end();it++) { - MEDCouplingAutoRefCountObjectPtr mesh(ParaMEDFileMesh::ParaNew(iPart,nbOfParts,com,nfo,fileName,(*it))); + MCAuto mesh(ParaMEDFileMesh::ParaNew(iPart,nbOfParts,com,nfo,fileName,(*it))); ret->pushMesh(mesh); } return ret.retn();