gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Replace std::auto_ptr uses by std::unique_ptr since the former is deprecated.

Browse Source 
This was SVN commit r16674.
This commit is contained in:
leper
2015-05-25 01:23:27 +00:00
parent 5b2e9c95e7
commit c93c1c92eb
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/collada/CommonConvert.h
+3 -3
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -86,8 +86,8 @@ public:
private:
void ReadExtras(xmlNode* colladaNode);
std::auto_ptr<FCDocument> document;
std::auto_ptr<FCDExtra> extra;
std::unique_ptr<FCDocument> document;
std::unique_ptr<FCDExtra> extra;
};
/**
source/collada/StdSkeletons.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -148,7 +148,7 @@ namespace
for (xmlNodeList::iterator skeletonNode = skeletonNodes.begin();
skeletonNode != skeletonNodes.end(); ++skeletonNode)
{
std::auto_ptr<Skeleton> skeleton (new Skeleton());
std::unique_ptr<Skeleton> skeleton (new Skeleton());
std::string title (FUXmlParser::ReadNodeProperty(*skeletonNode, "title"));
source/collada/StdSkeletons.h
+2 -2
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -93,7 +93,7 @@ public:
*/
static void LoadSkeletonDataFromXml(const char* xmlData, size_t xmlLength, std::string& xmlErrors);
std::auto_ptr<Skeleton_impl> m;
std::unique_ptr<Skeleton_impl> m;
private:
Skeleton(Skeleton&);
};