X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSauvWriter.hxx;h=27599a78a4d40727c6c45add6c10c83340295d68;hb=7126a380f58b740a46752e59318913032e951e35;hp=cbb64d3e6c846746d27483e31ea99d69652977f2;hpb=b4b11b30ec3c8c59b9124a2c4efbd4b99039556f;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/SauvWriter.hxx b/src/MEDLoader/SauvWriter.hxx index cbb64d3e6..27599a78a 100644 --- a/src/MEDLoader/SauvWriter.hxx +++ b/src/MEDLoader/SauvWriter.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 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 // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,13 +27,13 @@ #include "MEDCouplingRefCountObject.hxx" #include "NormalizedUnstructuredMesh.hxx" #include "SauvUtilities.hxx" -#include "MEDCouplingAutoRefCountObjectPtr.hxx" +#include "MCAuto.hxx" #include #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class MEDFileData; class MEDFileMesh; @@ -43,7 +43,7 @@ namespace ParaMEDMEM /*! * \brief Class to write a MEDFileData into a SAUVE format file */ - class SauvWriter : public ParaMEDMEM::RefCountObject + class SauvWriter : public MEDCoupling::RefCountObject { public: MEDLOADER_EXPORT static SauvWriter *New(); @@ -54,7 +54,7 @@ namespace ParaMEDMEM private: SauvWriter(); std::size_t getHeapMemorySizeWithoutChildren() const; - std::vector getDirectChildren() const; + std::vector getDirectChildrenWithNull() const; /*! * \brief Class representing a GIBI sub-mesh (described in the pile 1 of the SAUVE file). * It stands for a named med sub-mesh (family, etc) and contains either cell IDs or other sub-meshes. @@ -97,9 +97,9 @@ namespace ParaMEDMEM private: - MEDCouplingAutoRefCountObjectPtr< MEDFileMesh > _fileMesh; - std::vector< MEDCouplingAutoRefCountObjectPtr< MEDFileFieldMultiTS > > _nodeFields; - std::vector< MEDCouplingAutoRefCountObjectPtr< MEDFileFieldMultiTS > > _cellFields; + MCAuto< MEDFileMesh > _fileMesh; + std::vector< MCAuto< MEDFileFieldMultiTS > > _nodeFields; + std::vector< MCAuto< MEDFileFieldMultiTS > > _cellFields; std::vector _subs; std::map< int, SubMesh* > _famIDs2Sub;