From ef1b3c2ea0f3f44845f0db3419780584cb1aa545 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Mon, 27 Nov 2023 00:07:39 +0100 Subject: chore(Core/Misc): Clean up workarounds (#17870) * Clean advstd to use std c++20 features * Use ABORT instead of std::abort Co-authored-by: Shauren --- src/server/database/Database/MySQLConnection.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/database/Database/MySQLConnection.cpp') diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index 20c410de0a..73c3653cb8 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -581,7 +581,7 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/) { LOG_FATAL("sql.sql", "Could not re-prepare statements!"); std::this_thread::sleep_for(10s); - std::abort(); + ABORT(); } LOG_INFO("sql.sql", "Successfully reconnected to {} @{}:{} ({}).", @@ -600,7 +600,7 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/) // We could also initiate a shutdown through using std::raise(SIGTERM) std::this_thread::sleep_for(10s); - std::abort(); + ABORT(); } else { @@ -624,12 +624,12 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/) case ER_NO_SUCH_TABLE: LOG_ERROR("sql.sql", "Your database structure is not up to date. Please make sure you've executed all queries in the sql/updates folders."); std::this_thread::sleep_for(10s); - std::abort(); + ABORT(); return false; case ER_PARSE_ERROR: LOG_ERROR("sql.sql", "Error while parsing SQL. Core fix required."); std::this_thread::sleep_for(10s); - std::abort(); + ABORT(); return false; default: LOG_ERROR("sql.sql", "Unhandled MySQL errno {}. Unexpected behaviour possible.", errNo); -- cgit v1.2.3