Changeset 10773

Timestamp:

Nov 7, 2015, 6:03:26 PM (8 years ago)

Author:

landauf

Message:

using std::unique_ptr instead of std::auto_ptr

Location:

code/branches/cpp11_v2/src

Files:

• external/tinyxml/ticpp.cpp (modified) (2 diffs)
• external/tinyxml/ticpp.h (modified) (3 diffs)
• libraries/core/GUIManager.cc (modified) (1 diff)

code/branches/cpp11_v2/src/external/tinyxml/ticpp.cpp

@@ -717 +717 @@
 }
 
-std::auto_ptr< Node > Node::Clone() const
+std::unique_ptr< Node > Node::Clone() const
 {
         TiXmlNode* node = GetTiXmlPointer()->Clone();
@@ -724 +724 @@
                 TICPPTHROW( "Node could not be cloned" );
         }
-        std::auto_ptr< Node > temp( NodeFactory( node, false, false ) );
+        std::unique_ptr< Node > temp( NodeFactory( node, false, false ) );
 
         // Take ownership of the memory from TiXml

code/branches/cpp11_v2/src/external/tinyxml/ticpp.h

@@ -966 +966 @@
                 Create an exact duplicate of this node and return it.
 
-                @note Using auto_ptr to manage the memory declared on the heap by TiXmlNode::Clone.
+                @note Using unique_ptr to manage the memory declared on the heap by TiXmlNode::Clone.
                 @code
                 // Now using clone
@@ -972 +972 @@
                 ticpp::Node* sectionToClone;
                 sectionToClone = doc.FirstChild( "settings" );
-                std::auto_ptr< ticpp::Node > clonedNode = sectionToClone->Clone();
+                std::unique_ptr< ticpp::Node > clonedNode = sectionToClone->Clone();
                 // Now you can use the clone.
                 ticpp::Node* node2 = clonedNode->FirstChildElement()->FirstChild();
@@ -980 +980 @@
                 @return Pointer the duplicate node.
                 */
-                std::auto_ptr< Node > Clone() const;
+                std::unique_ptr< Node > Clone() const;
 
                 /**

code/branches/cpp11_v2/src/libraries/core/GUIManager.cc

@@ -330 +330 @@
 
         // Create our own logger to specify the filepath
-        std::auto_ptr<CEGUILogger> ceguiLogger(new CEGUILogger());
+        std::unique_ptr<CEGUILogger> ceguiLogger(new CEGUILogger());
         ceguiLogger->setLogFilename(ConfigurablePaths::getLogPathString() + "cegui.log");
         ceguiLogger->setLoggingLevel(static_cast<CEGUI::LoggingLevel>(this->outputLevelCeguiLog_));