From bb96972a03367c84e4cf3417f191952891cd064c Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 16 Oct 2015 14:05:22 +0400 Subject: [PATCH] C++11 compatibility --- src/MEDCoupling/MEDCouplingFieldDouble.hxx | 3 ++- src/MEDLoader/MEDFileMeshLL.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.hxx b/src/MEDCoupling/MEDCouplingFieldDouble.hxx index ee9a2506a..065718a65 100644 --- a/src/MEDCoupling/MEDCouplingFieldDouble.hxx +++ b/src/MEDCoupling/MEDCouplingFieldDouble.hxx @@ -197,12 +197,13 @@ namespace ParaMEDMEM MEDCOUPLING_EXPORT const MEDCouplingTimeDiscretization *getTimeDiscretizationUnderGround() const { return _time_discr; } MEDCOUPLING_EXPORT MEDCouplingTimeDiscretization *getTimeDiscretizationUnderGround() { return _time_discr; } MEDCOUPLING_EXPORT void reprQuickOverview(std::ostream& stream) const; + protected: + ~MEDCouplingFieldDouble(); private: MEDCouplingFieldDouble(TypeOfField type, TypeOfTimeDiscretization td); MEDCouplingFieldDouble(const MEDCouplingFieldTemplate& ft, TypeOfTimeDiscretization td); MEDCouplingFieldDouble(const MEDCouplingFieldDouble& other, bool deepCopy); MEDCouplingFieldDouble(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type); - ~MEDCouplingFieldDouble(); private: MEDCouplingTimeDiscretization *_time_discr; }; diff --git a/src/MEDLoader/MEDFileMeshLL.cxx b/src/MEDLoader/MEDFileMeshLL.cxx index 639e0f7fa..483c2797e 100644 --- a/src/MEDLoader/MEDFileMeshLL.cxx +++ b/src/MEDLoader/MEDFileMeshLL.cxx @@ -128,7 +128,7 @@ double MEDFileMeshL2::CheckMeshTimeStep(med_idt fid, const std::string& mName, i for(int i=0;i(numdt,numit); + p[i]=std::make_pair(numdt,numit); found=(numdt==dt) && (numit==numit); } if(!found) -- 2.39.2