From: Daniel Arndt Date: Fri, 30 Mar 2018 10:54:37 +0000 (+0200) Subject: Avoid auto_ptr in bundled muParser X-Git-Tag: v9.0.0-rc1~262^2~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dcc180b65c374bd909155095a7c993e37f91b7c;p=dealii.git Avoid auto_ptr in bundled muParser --- diff --git a/bundled/muparser_v2_2_4/include/muParserBase.h b/bundled/muparser_v2_2_4/include/muParserBase.h index beb15bb198..685f59fbd9 100644 --- a/bundled/muparser_v2_2_4/include/muParserBase.h +++ b/bundled/muparser_v2_2_4/include/muParserBase.h @@ -288,7 +288,7 @@ private: mutable stringbuf_type m_vStringBuf; ///< String buffer, used for storing string function arguments stringbuf_type m_vStringVarBuf; - std::auto_ptr m_pTokenReader; ///< Managed pointer to the token reader object. + std::unique_ptr m_pTokenReader; ///< Managed pointer to the token reader object. funmap_type m_FunDef; ///< Map of function names and pointers. funmap_type m_PostOprtDef; ///< Postfix operator callbacks diff --git a/bundled/muparser_v2_2_4/include/muParserToken.h b/bundled/muparser_v2_2_4/include/muParserToken.h index fc91d7818c..0cca469b3f 100644 --- a/bundled/muparser_v2_2_4/include/muParserToken.h +++ b/bundled/muparser_v2_2_4/include/muParserToken.h @@ -69,7 +69,7 @@ namespace mu TString m_strTok; ///< Token string TString m_strVal; ///< Value for string variables value_type m_fVal; ///< the value - std::auto_ptr m_pCallback; + std::unique_ptr m_pCallback; public: diff --git a/bundled/muparser_v2_2_4/src/muParserTest.cpp b/bundled/muparser_v2_2_4/src/muParserTest.cpp index d5bc05420c..af2aa86d12 100644 --- a/bundled/muparser_v2_2_4/src/muParserTest.cpp +++ b/bundled/muparser_v2_2_4/src/muParserTest.cpp @@ -1258,7 +1258,7 @@ namespace mu try { - std::auto_ptr p1; + std::unique_ptr p1; Parser p2, p3; // three parser objects // they will be used for testing copy and assihnment operators // p1 is a pointer since i'm going to delete it in order to test if diff --git a/bundled/muparser_v2_2_4/src/muParserTokenReader.cpp b/bundled/muparser_v2_2_4/src/muParserTokenReader.cpp index 4bafd3127a..fec0a14c4e 100644 --- a/bundled/muparser_v2_2_4/src/muParserTokenReader.cpp +++ b/bundled/muparser_v2_2_4/src/muParserTokenReader.cpp @@ -147,7 +147,7 @@ namespace mu */ ParserTokenReader* ParserTokenReader::Clone(ParserBase *a_pParent) const { - std::auto_ptr ptr(new ParserTokenReader(*this)); + std::unique_ptr ptr(new ParserTokenReader(*this)); ptr->SetParent(a_pParent); return ptr.release(); }