Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-08-01 15:41:23 +08:00
251 changed files with 4841 additions and 6135 deletions

View File

@@ -155,11 +155,11 @@ bool DatabaseWorkerPool<T>::PrepareStatements()
else
connection->Unlock();
size_t const preparedSize = connection->m_stmts.size();
std::size_t const preparedSize = connection->m_stmts.size();
if (_preparedStatementSize.size() < preparedSize)
_preparedStatementSize.resize(preparedSize);
for (size_t i = 0; i < preparedSize; ++i)
for (std::size_t i = 0; i < preparedSize; ++i)
{
// already set by another connection
// (each connection only has prepared statements of it's own type sync/async)
@@ -489,7 +489,7 @@ void DatabaseWorkerPool<T>::Enqueue(SQLOperation* op)
}
template <class T>
size_t DatabaseWorkerPool<T>::QueueSize() const
std::size_t DatabaseWorkerPool<T>::QueueSize() const
{
return _queue->Size();
}