X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingMultiFields.hxx;h=3c16fdb1805e42c6f78f507cb84996141c54f749;hb=3e9ebc98a6bc02022900a8b2295e1a775d78ece0;hp=b092bc60d6f3f9d1a7a3b1e4f417cdfb39d0996f;hpb=56fddf07c0b7170f79791d38e2b909a8a5b0b872;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingMultiFields.hxx b/src/MEDCoupling/MEDCouplingMultiFields.hxx index b092bc60d..3c16fdb18 100644 --- a/src/MEDCoupling/MEDCouplingMultiFields.hxx +++ b/src/MEDCoupling/MEDCouplingMultiFields.hxx @@ -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 @@ -23,13 +23,13 @@ #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingTimeLabel.hxx" -#include "MEDCouplingAutoRefCountObjectPtr.hxx" +#include "MCAuto.hxx" #include "InterpKernelException.hxx" #include -namespace ParaMEDMEM +namespace MEDCoupling { class MEDCouplingMesh; class DataArrayDouble; @@ -41,7 +41,7 @@ namespace ParaMEDMEM public: MEDCOUPLING_EXPORT static MEDCouplingMultiFields *New(const std::vector& fs); MEDCOUPLING_EXPORT static MEDCouplingMultiFields *New(); - MEDCOUPLING_EXPORT MEDCouplingMultiFields *deepCpy() const; + MEDCOUPLING_EXPORT MEDCouplingMultiFields *deepCopy() const; MEDCOUPLING_EXPORT std::string getName() const; MEDCOUPLING_EXPORT std::string getDescription() const; MEDCOUPLING_EXPORT std::string getTimeUnit() const; @@ -65,13 +65,13 @@ namespace ParaMEDMEM MEDCOUPLING_EXPORT void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoD, const std::vector& ft, const std::vector& ms, const std::vector& das); - MEDCOUPLING_EXPORT virtual void checkCoherency() const; + MEDCOUPLING_EXPORT virtual void checkConsistencyLight() const; protected: MEDCOUPLING_EXPORT MEDCouplingMultiFields(const std::vector& fs); MEDCOUPLING_EXPORT MEDCouplingMultiFields(const MEDCouplingMultiFields& other); MEDCOUPLING_EXPORT MEDCouplingMultiFields(); protected: - std::vector< MEDCouplingAutoRefCountObjectPtr > _fs; + std::vector< MCAuto > _fs; }; }