]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid auto_ptr in bundled muParser
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 30 Mar 2018 10:54:37 +0000 (12:54 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 30 Mar 2018 10:55:45 +0000 (12:55 +0200)
bundled/muparser_v2_2_4/include/muParserBase.h
bundled/muparser_v2_2_4/include/muParserToken.h
bundled/muparser_v2_2_4/src/muParserTest.cpp
bundled/muparser_v2_2_4/src/muParserTokenReader.cpp

index beb15bb198080beb26543f131c65c7625b3134b3..685f59fbd95065a316ee4cb4bb2a88d6dfd006d9 100644 (file)
@@ -288,7 +288,7 @@ private:
     mutable stringbuf_type  m_vStringBuf; ///< String buffer, used for storing string function arguments\r
     stringbuf_type  m_vStringVarBuf;\r
 \r
-    std::auto_ptr<token_reader_type> m_pTokenReader; ///< Managed pointer to the token reader object.\r
+    std::unique_ptr<token_reader_type> m_pTokenReader; ///< Managed pointer to the token reader object.\r
 \r
     funmap_type  m_FunDef;         ///< Map of function names and pointers.\r
     funmap_type  m_PostOprtDef;    ///< Postfix operator callbacks\r
index fc91d7818c0648e8a79cecd489195e4ade5b927d..0cca469b3ff089bfb05e32a14b9cabded3e67881 100644 (file)
@@ -69,7 +69,7 @@ namespace mu
       TString m_strTok;   ///< Token string\r
       TString m_strVal;   ///< Value for string variables\r
       value_type m_fVal;  ///< the value \r
-      std::auto_ptr<ParserCallback> m_pCallback;\r
+      std::unique_ptr<ParserCallback> m_pCallback;\r
 \r
   public:\r
 \r
index d5bc05420c3e074ccf3ae8e7d1086f60d08d7ff4..af2aa86d125ec6f008b66de8b894e9b36e0b4a29 100644 (file)
@@ -1258,7 +1258,7 @@ namespace mu
 \r
       try\r
       {\r
-        std::auto_ptr<Parser> p1;\r
+        std::unique_ptr<Parser> p1;\r
         Parser  p2, p3;   // three parser objects\r
                           // they will be used for testing copy and assihnment operators\r
         // p1 is a pointer since i'm going to delete it in order to test if\r
index 4bafd3127af2332e575044896dc63282098a671b..fec0a14c4e24f055a3600fb2bbd22d5b6cbec4c7 100644 (file)
@@ -147,7 +147,7 @@ namespace mu
   */\r
   ParserTokenReader* ParserTokenReader::Clone(ParserBase *a_pParent) const\r
   {\r
-    std::auto_ptr<ParserTokenReader> ptr(new ParserTokenReader(*this));\r
+    std::unique_ptr<ParserTokenReader> ptr(new ParserTokenReader(*this));\r
     ptr->SetParent(a_pParent);\r
     return ptr.release();\r
   }\r

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.