nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-29 08:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Misc): remove ACE Auto_Ptr (#3454)

Browse Source
This commit is contained in:
Kargatum
2020-11-23 08:10:33 +07:00
committed by GitHub
parent 2e3c98df94
commit 37ba988409
7 changed files with 13 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/Database/DatabaseWorkerPool.cpp
View File

@@ -262,7 +262,7 @@ void DatabaseWorkerPool<T>::DirectCommitTransaction(SQLTransaction& transaction)
template <class T>
void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedStatement* stmt)
{
if (trans.null())
if (!trans)
Execute(stmt);
else
trans->Append(stmt);
@@ -271,7 +271,7 @@ void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedState
template <class T>
void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, const char* sql)
{
if (trans.null())
if (!trans)
Execute(sql);
else
trans->Append(sql);

5
src/common/Database/QueryResult.h
View File

@@ -7,7 +7,6 @@
#ifndef QUERYRESULT_H
#define QUERYRESULT_H
#include "AutoPtr.h"
#include <ace/Thread_Mutex.h>
#include "Errors.h"
@@ -52,7 +51,7 @@ private:
MYSQL_FIELD* _fields;
};
typedef acore::AutoPtr<ResultSet, ACE_Thread_Mutex> QueryResult;
typedef std::shared_ptr<ResultSet> QueryResult;
class PreparedResultSet
{
@@ -97,7 +96,7 @@ private:
};
typedef acore::AutoPtr<PreparedResultSet, ACE_Thread_Mutex> PreparedQueryResult;
typedef std::shared_ptr<PreparedResultSet> PreparedQueryResult;
#endif

4
src/common/Database/Transaction.h
View File

@@ -37,9 +37,9 @@ protected:
private:
bool _cleanedUp;
};
typedef acore::AutoPtr<Transaction, ACE_Thread_Mutex> SQLTransaction;
typedef std::shared_ptr<Transaction> SQLTransaction;
/*! Low level class*/
class TransactionTask : public SQLOperation