X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMEDLoader%2FSauvReader.hxx;h=e2135a4220edf7f8013f9921e4de2645f342248b;hb=5ea9370443568d9dd6c42c970cbc24c1b6ae6c28;hp=1a07854e6d89a6dfdbda229e8f51f489582982ec;hpb=bff1bf976eba81504d3dd5d8b5a92922885d7d1c;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/SauvReader.hxx b/src/MEDLoader/SauvReader.hxx index 1a07854e6..e2135a422 100644 --- a/src/MEDLoader/SauvReader.hxx +++ b/src/MEDLoader/SauvReader.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 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 @@ -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 std::string& fileName); - MEDLOADER_EXPORT ParaMEDMEM::MEDFileData * loadInMEDFileDS(bool fix2DOri=false); + 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);