Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10773


Ignore:
Timestamp:
Nov 7, 2015, 6:03:26 PM (9 years ago)
Author:
landauf
Message:

using std::unique_ptr instead of std::auto_ptr

Location:
code/branches/cpp11_v2/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2/src/external/tinyxml/ticpp.cpp

    r8351 r10773  
    717717}
    718718
    719 std::auto_ptr< Node > Node::Clone() const
     719std::unique_ptr< Node > Node::Clone() const
    720720{
    721721        TiXmlNode* node = GetTiXmlPointer()->Clone();
     
    724724                TICPPTHROW( "Node could not be cloned" );
    725725        }
    726         std::auto_ptr< Node > temp( NodeFactory( node, false, false ) );
     726        std::unique_ptr< Node > temp( NodeFactory( node, false, false ) );
    727727
    728728        // Take ownership of the memory from TiXml
  • code/branches/cpp11_v2/src/external/tinyxml/ticpp.h

    r8351 r10773  
    966966                Create an exact duplicate of this node and return it.
    967967
    968                 @note Using auto_ptr to manage the memory declared on the heap by TiXmlNode::Clone.
     968                @note Using unique_ptr to manage the memory declared on the heap by TiXmlNode::Clone.
    969969                @code
    970970                // Now using clone
     
    972972                ticpp::Node* sectionToClone;
    973973                sectionToClone = doc.FirstChild( "settings" );
    974                 std::auto_ptr< ticpp::Node > clonedNode = sectionToClone->Clone();
     974                std::unique_ptr< ticpp::Node > clonedNode = sectionToClone->Clone();
    975975                // Now you can use the clone.
    976976                ticpp::Node* node2 = clonedNode->FirstChildElement()->FirstChild();
     
    980980                @return Pointer the duplicate node.
    981981                */
    982                 std::auto_ptr< Node > Clone() const;
     982                std::unique_ptr< Node > Clone() const;
    983983
    984984                /**
  • code/branches/cpp11_v2/src/libraries/core/GUIManager.cc

    r10769 r10773  
    330330
    331331        // Create our own logger to specify the filepath
    332         std::auto_ptr<CEGUILogger> ceguiLogger(new CEGUILogger());
     332        std::unique_ptr<CEGUILogger> ceguiLogger(new CEGUILogger());
    333333        ceguiLogger->setLogFilename(ConfigurablePaths::getLogPathString() + "cegui.log");
    334334        ceguiLogger->setLoggingLevel(static_cast<CEGUI::LoggingLevel>(this->outputLevelCeguiLog_));
Note: See TracChangeset for help on using the changeset viewer.