diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-06-23 08:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 08:54:12 +0200 |
| commit | bab5fd87a34d92737e92d0850be05890a5ce8e24 (patch) | |
| tree | 6c83cf8a907dc04075b52f394e25a33985dc5b41 /src/server/database/Database | |
| parent | 01c8d03e2ec67d4d4660e7e229274e86ba41420e (diff) | |
Core/Misc: Replace Trinity::make_unique with std (#24869)
Diffstat (limited to 'src/server/database/Database')
| -rw-r--r-- | src/server/database/Database/DatabaseWorkerPool.cpp | 6 | ||||
| -rw-r--r-- | src/server/database/Database/MySQLConnection.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index 0cb755ce073..39330288a8d 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -69,7 +69,7 @@ template <class T> void DatabaseWorkerPool<T>::SetConnectionInfo(std::string const& infoString, uint8 const asyncThreads, uint8 const synchThreads) { - _connectionInfo = Trinity::make_unique<MySQLConnectionInfo>(infoString); + _connectionInfo = std::make_unique<MySQLConnectionInfo>(infoString); _async_threads = asyncThreads; _synch_threads = synchThreads; @@ -365,9 +365,9 @@ uint32 DatabaseWorkerPool<T>::OpenConnections(InternalIndex type, uint8 numConne switch (type) { case IDX_ASYNC: - return Trinity::make_unique<T>(_queue.get(), *_connectionInfo); + return std::make_unique<T>(_queue.get(), *_connectionInfo); case IDX_SYNCH: - return Trinity::make_unique<T>(*_connectionInfo); + return std::make_unique<T>(*_connectionInfo); default: ABORT(); } diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index bde2004afdf..f141663b824 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -62,7 +62,7 @@ m_Mysql(NULL), m_connectionInfo(connInfo), m_connectionFlags(CONNECTION_ASYNC) { - m_worker = Trinity::make_unique<DatabaseWorker>(m_queue, this); + m_worker = std::make_unique<DatabaseWorker>(m_queue, this); } MySQLConnection::~MySQLConnection() @@ -486,7 +486,7 @@ void MySQLConnection::PrepareStatement(uint32 index, std::string const& sql, Con m_prepareError = true; } else - m_stmts[index] = Trinity::make_unique<MySQLPreparedStatement>(reinterpret_cast<MySQLStmt*>(stmt), sql); + m_stmts[index] = std::make_unique<MySQLPreparedStatement>(reinterpret_cast<MySQLStmt*>(stmt), sql); } } |