ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use unique_ptr instead of auto_ptr

Browse Source
This commit is contained in:
deve 2015-08-06 13:54:29 +02:00
parent 75c1f02615
commit e1f61040e5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/challenges/challenge_data.cpp
View File

@ -53,7 +53,7 @@ ChallengeData::ChallengeData(const std::string& filename)
// we are using auto_ptr to make sure the XML node is released when leaving // we are using auto_ptr to make sure the XML node is released when leaving
// the scope // the scope
std::auto_ptr<XMLNode> root(new XMLNode( filename )); std::unique_ptr<XMLNode> root(new XMLNode( filename ));
if(root.get() == NULL || root->getName()!="challenge") if(root.get() == NULL || root->getName()!="challenge")
{ {

2
src/guiengine/widgets/icon_button_widget.cpp
View File

@ -342,7 +342,7 @@ video::ITexture* IconButtonWidget::getDeactivatedTexture(video::ITexture* textur
u32 g; u32 g;
video::IVideoDriver* driver = irr_driver->getVideoDriver(); video::IVideoDriver* driver = irr_driver->getVideoDriver();
std::auto_ptr<video::IImage> image (driver->createImageFromData (texture->getColorFormat(), std::unique_ptr<video::IImage> image (driver->createImageFromData (texture->getColorFormat(),
texture->getSize(), texture->lock(), false)); texture->getSize(), texture->lock(), false));
texture->unlock(); texture->unlock();

2
src/race/grand_prix_data.cpp
View File

@ -251,7 +251,7 @@ void GrandPrixData::reload()
m_laps.clear(); m_laps.clear();
m_reversed.clear(); m_reversed.clear();
std::auto_ptr<XMLNode> root(file_manager->createXMLTree(m_filename)); std::unique_ptr<XMLNode> root(file_manager->createXMLTree(m_filename));
if (root.get() == NULL) if (root.get() == NULL)
{ {
Log::error("GrandPrixData", Log::error("GrandPrixData",