X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSauvReader.hxx;h=a9d28915ed063b80f2b1d3534886d508100b1db8;hb=88916ccf9c681624b682d10a62c1ee376324c946;hp=cb7b7e6b6e03e2de2039cf69aa28ee11ba20e1aa;hpb=c367c43491431ce0119c9b948c25b17895318ad0;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/SauvReader.hxx b/src/MEDLoader/SauvReader.hxx index cb7b7e6b6..a9d28915e 100644 --- a/src/MEDLoader/SauvReader.hxx +++ b/src/MEDLoader/SauvReader.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2019 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 @@ -39,23 +39,24 @@ namespace SauvUtilities struct Group; struct DoubleField; } -namespace ParaMEDMEM +namespace MEDCoupling { class MEDFileData; -class SauvReader : public ParaMEDMEM::RefCountObject +class SauvReader : public MEDCoupling::RefCountObject { public: - MEDLOADER_EXPORT static SauvReader* New(const char *fileName); - MEDLOADER_EXPORT ParaMEDMEM::MEDFileData * loadInMEDFileDS(); + MEDLOADER_EXPORT static SauvReader* New(const std::string& fileName); + MEDLOADER_EXPORT MEDCoupling::MEDFileData * loadInMEDFileDS(); MEDLOADER_EXPORT ~SauvReader(); private: std::size_t getHeapMemorySizeWithoutChildren() const; - std::vector getDirectChildren() const; + std::vector getDirectChildrenWithNull() const; void readRecord2(); void readRecord4(); void readRecord7(); + void readRecord8(); int readPileNumber(int& nbNamedObjects, int& nbObjects); void read_PILE_SOUS_MAILLAGE(const int nbObjects, std::vector& objectNames, std::vector& nameIndices);