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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EnumHelper.cpp
+7 -7
View File
@@ -80,18 +80,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() == NULL) )
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
@@ -140,7 +140,7 @@ namespace
static const luaL_Reg EnumLib[] = {
{ "GetName", GetName },
{ "Reverse", Reverse },
{ NULL, NULL }
{ nullptr, nullptr }
};
static void PushEnumMethodTable( lua_State *L )