actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change our auto_ptr's to unique_ptr's.

Browse Source 
auto_ptr is deprecated in c++11.
This commit is contained in:
Jason Felds
2013-05-04 14:11:47 -04:00
parent a8fe2634ca
commit 25c3c7d4f1
9 changed files with 472 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EnumHelper.cpp
+5 -5
View File
@@ -51,18 +51,18 @@ int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const
}
// szNameArray is of size iMax; pNameCache is of size iMax+2.
const RString &EnumToString( int iVal, int iMax, const char **szNameArray, auto_ptr<RString> *pNameCache )
const RString &EnumToString( int iVal, int iMax, const char **szNameArray, unique_ptr<RString> *pNameCache )
{
if( unlikely(pNameCache[0].get() == nullptr) )
{
for( int i = 0; i < iMax; ++i )
{
auto_ptr<RString> ap( new RString( szNameArray[i] ) );
pNameCache[i] = ap;
unique_ptr<RString> ap( new RString( szNameArray[i] ) );
pNameCache[i] = move(ap);
}
auto_ptr<RString> ap( new RString );
pNameCache[iMax+1] = ap;
unique_ptr<RString> ap( new RString );
pNameCache[iMax+1] = move(ap);
}
// iMax+1 is "Invalid". iMax+0 is the NUM_ size value, which can not be converted