From: vsr Date: Fri, 16 Oct 2015 10:05:22 +0000 (+0400) Subject: Enable C++0x/C++11 support X-Git-Tag: V8_0_pre X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=70e5a738432f6797ddc84e6687a112ce72d6a5dc;p=tools%2Fmedcoupling.git Enable C++0x/C++11 support --- 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 218f7bb72..cf6177beb 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)