UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use more STL for vector insertion/removal. (#1284)

Browse Source
This commit is contained in:
David Anderson 2020-06-13 15:57:02 -07:00 committed by GitHub
parent 7b887ee9f6
commit 3b386379dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/MenuStyle_Base.cpp
View File

@ -661,7 +661,7 @@ bool CBaseMenu::InsertItem(unsigned int position, const char *info, const ItemDr
item.display = std::make_unique<std::string>(draw.display); item.display = std::make_unique<std::string>(draw.display);
item.style = draw.style; item.style = draw.style;
ke::InsertAt(&m_items, position, std::move(item)); m_items.emplace(m_items.begin() + position, std::move(item));
return true; return true;
} }
@ -670,7 +670,7 @@ bool CBaseMenu::RemoveItem(unsigned int position)
if (position >= m_items.size()) if (position >= m_items.size())
return false; return false;
ke::RemoveAt(&m_items, position); m_items.erase(m_items.begin() + position);
return true; return true;
} }

24
core/logic/CDataPack.cpp
View File

@ -51,7 +51,7 @@ static std::vector<std::unique_ptr<CDataPack>> sDataPackCache;
CDataPack *CDataPack::New() CDataPack *CDataPack::New()
{ {
if (sDataPackCache.empty()) if (sDataPackCache.empty())
return new CDataPack(); return new CDataPack();
CDataPack *pack = sDataPackCache.back().release(); CDataPack *pack = sDataPackCache.back().release();
sDataPackCache.pop_back(); sDataPackCache.pop_back();
@ -87,7 +87,7 @@ size_t CDataPack::CreateMemory(size_t size, void **addr)
val.type = CDataPackType::Raw; val.type = CDataPackType::Raw;
val.pData.vval = new uint8_t[size + sizeof(size)]; val.pData.vval = new uint8_t[size + sizeof(size)];
reinterpret_cast<size_t *>(val.pData.vval)[0] = size; reinterpret_cast<size_t *>(val.pData.vval)[0] = size;
ke::InsertAt(&elements, position, val); elements.emplace(elements.begin() + position, val);
return position++; return position++;
} }
@ -97,7 +97,8 @@ void CDataPack::PackCell(cell_t cell)
InternalPack val; InternalPack val;
val.type = CDataPackType::Cell; val.type = CDataPackType::Cell;
val.pData.cval = cell; val.pData.cval = cell;
ke::InsertAt(&elements, position++, val); elements.emplace(elements.begin() + position, val);
position++;
} }
void CDataPack::PackFunction(cell_t function) void CDataPack::PackFunction(cell_t function)
@ -105,7 +106,8 @@ void CDataPack::PackFunction(cell_t function)
InternalPack val; InternalPack val;
val.type = CDataPackType::Function; val.type = CDataPackType::Function;
val.pData.cval = function; val.pData.cval = function;
ke::InsertAt(&elements, position++, val); elements.emplace(elements.begin() + position, val);
position++;
} }
void CDataPack::PackFloat(float floatval) void CDataPack::PackFloat(float floatval)
@ -113,7 +115,8 @@ void CDataPack::PackFloat(float floatval)
InternalPack val; InternalPack val;
val.type = CDataPackType::Float; val.type = CDataPackType::Float;
val.pData.fval = floatval; val.pData.fval = floatval;
ke::InsertAt(&elements, position++, val); elements.emplace(elements.begin() + position, val);
position++;
} }
void CDataPack::PackString(const char *string) void CDataPack::PackString(const char *string)
@ -122,7 +125,8 @@ void CDataPack::PackString(const char *string)
val.type = CDataPackType::String; val.type = CDataPackType::String;
std::string *sval = new std::string(string); std::string *sval = new std::string(string);
val.pData.sval = sval; val.pData.sval = sval;
ke::InsertAt(&elements, position++, val); elements.emplace(elements.begin() + position, val);
position++;
} }
void CDataPack::PackCellArray(cell_t const *vals, cell_t count) void CDataPack::PackCellArray(cell_t const *vals, cell_t count)
@ -133,7 +137,8 @@ void CDataPack::PackCellArray(cell_t const *vals, cell_t count)
val.pData.aval = new cell_t [count + 1]; val.pData.aval = new cell_t [count + 1];
memcpy(&val.pData.aval[1], vals, sizeof(cell_t) * (count + 1)); memcpy(&val.pData.aval[1], vals, sizeof(cell_t) * (count + 1));
val.pData.aval[0] = count; val.pData.aval[0] = count;
ke::InsertAt(&elements, position++, val); elements.emplace(elements.begin() + position, val);
position++;
} }
void CDataPack::PackFloatArray(cell_t const *vals, cell_t count) void CDataPack::PackFloatArray(cell_t const *vals, cell_t count)
@ -144,7 +149,8 @@ void CDataPack::PackFloatArray(cell_t const *vals, cell_t count)
val.pData.aval = new cell_t [count + 1]; val.pData.aval = new cell_t [count + 1];
memcpy(&val.pData.aval[1], vals, sizeof(cell_t) * (count + 1)); memcpy(&val.pData.aval[1], vals, sizeof(cell_t) * (count + 1));
val.pData.aval[0] = count; val.pData.aval[0] = count;
ke::InsertAt(&elements, position++, val); elements.emplace(elements.begin() + position, val);
position++;
} }
void CDataPack::Reset() const void CDataPack::Reset() const
@ -312,6 +318,6 @@ bool CDataPack::RemoveItem(size_t pos)
} }
} }
ke::RemoveAt(&elements, pos); elements.erase(elements.begin() + pos);
return true; return true;
} }

3
extensions/clientprefs/extension.cpp
View File

@ -379,7 +379,8 @@ void ClientPrefs::ClearQueryCache(int serial)
if (op && op->PullQueryType() == Query_SelectData && op->PullQuerySerial() == serial) if (op && op->PullQueryType() == Query_SelectData && op->PullQuerySerial() == serial)
{ {
op->Destroy(); op->Destroy();
ke::RemoveAt(&cachedQueries, iter--); cachedQueries.erase(cachedQueries.begin() + iter);
iter--;
} }
} }
} }

18
extensions/sdkhooks/extension.cpp
View File

@ -771,13 +771,15 @@ void SDKHooks::Unhook(CBaseEntity *pEntity)
continue; continue;
} }
ke::RemoveAt(&pawnhooks, entry--); pawnhooks.erase(pawnhooks.begin() + entry);
entry--;
} }
if (pawnhooks.size() == 0) if (pawnhooks.size() == 0)
{ {
delete vtablehooklist[listentry]; delete vtablehooklist[listentry];
ke::RemoveAt(&vtablehooklist, listentry--); vtablehooklist.erase(vtablehooklist.begin() + listentry);
listentry--;
} }
} }
} }
@ -798,13 +800,15 @@ void SDKHooks::Unhook(IPluginContext *pContext)
continue; continue;
} }
ke::RemoveAt(&pawnhooks, entry--); pawnhooks.erase(pawnhooks.begin() + entry);
entry--;
} }
if (pawnhooks.size() == 0) if (pawnhooks.size() == 0)
{ {
delete vtablehooklist[listentry]; delete vtablehooklist[listentry];
ke::RemoveAt(&vtablehooklist, listentry--); vtablehooklist.erase(vtablehooklist.begin() + listentry);
listentry--;
} }
} }
} }
@ -838,13 +842,15 @@ void SDKHooks::Unhook(int entity, SDKHookType type, IPluginFunction *pCallback)
continue; continue;
} }
ke::RemoveAt(&pawnhooks, entry--); pawnhooks.erase(pawnhooks.begin() + entry);
entry--;
} }
if (pawnhooks.size() == 0) if (pawnhooks.size() == 0)
{ {
delete vtablehooklist[listentry]; delete vtablehooklist[listentry];
ke::RemoveAt(&vtablehooklist, listentry); vtablehooklist.erase(vtablehooklist.begin() + listentry);
listentry--;
} }
break; break;