Core/Misc: Fixed build with c++23 enabled

Closes #30511
This commit is contained in:
Shauren
2024-12-16 11:56:03 +01:00
parent bb583baef6
commit ed666e4e8c
7 changed files with 28 additions and 5 deletions

View File

@@ -53,13 +53,13 @@ template <typename To, typename From,
}
// std::ranges::contains
#ifndef __cpp_lib_ranges_contains
#include <algorithm> // for std::ranges::find
#include <functional> // for std::ranges::equal_to, std::identity
#include <iterator> // for std::input_iterator, std::sentinel_for, std::projected
#include <algorithm>
namespace advstd::ranges
{
#ifndef __cpp_lib_ranges_contains
#include <functional> // for std::ranges::equal_to, std::identity
#include <iterator> // for std::input_iterator, std::sentinel_for, std::projected
struct Contains
{
template<std::input_iterator I, std::sentinel_for<I> S, class T, class Proj = std::identity>
@@ -78,7 +78,9 @@ struct Contains
return std::ranges::find(std::move(first), last, value, proj) != last;
}
} inline constexpr contains;
}
#else
using std::ranges::contains;
#endif
}
#endif

View File

@@ -30,6 +30,8 @@ std::mutex TransactionTask::_deadlockLock;
#define DEADLOCK_MAX_RETRY_TIME_MS 60000
TransactionData::~TransactionData() = default;
//- Append a raw ad-hoc query to the transaction
void TransactionBase::Append(char const* sql)
{

View File

@@ -35,6 +35,11 @@ struct TransactionData
template<typename... Args>
TransactionData(Args&&... args) : query(std::forward<Args>(args)...) { }
TransactionData(TransactionData const&) = delete;
TransactionData(TransactionData&&) noexcept = default;
TransactionData& operator=(TransactionData const&) = delete;
TransactionData& operator=(TransactionData&&) noexcept = default;
~TransactionData();
static PreparedStatementBase* ToExecutable(std::unique_ptr<PreparedStatementBase> const& stmt) { return stmt.get(); }
static char const* ToExecutable(std::string const& sql) { return sql.c_str(); }

View File

@@ -36,6 +36,8 @@ FleeingMovementGenerator::FleeingMovementGenerator(ObjectGuid fleeTargetGUID,
ScriptResult = std::move(scriptResult);
}
FleeingMovementGenerator::~FleeingMovementGenerator() = default;
MovementGeneratorType FleeingMovementGenerator::GetMovementGeneratorType() const
{
return FLEEING_MOTION_TYPE;

View File

@@ -30,6 +30,11 @@ class FleeingMovementGenerator : public MovementGenerator
public:
explicit FleeingMovementGenerator(ObjectGuid fleeTargetGUID,
Optional<Scripting::v2::ActionResultSetter<MovementStopReason>>&& scriptResult = {});
FleeingMovementGenerator(FleeingMovementGenerator const&) = delete;
FleeingMovementGenerator(FleeingMovementGenerator&&) = delete;
FleeingMovementGenerator& operator=(FleeingMovementGenerator const&) = delete;
FleeingMovementGenerator& operator=(FleeingMovementGenerator&&) = delete;
~FleeingMovementGenerator();
MovementGeneratorType GetMovementGeneratorType() const override;

View File

@@ -45,6 +45,8 @@ PointMovementGenerator::PointMovementGenerator(uint32 id, float x, float y, floa
this->i_spellEffectExtra = std::make_unique<Movement::SpellEffectExtraData>(*spellEffectExtraData);
}
PointMovementGenerator::~PointMovementGenerator() = default;
MovementGeneratorType PointMovementGenerator::GetMovementGeneratorType() const
{
return POINT_MOTION_TYPE;

View File

@@ -35,6 +35,11 @@ class PointMovementGenerator : public MovementGenerator
MovementWalkRunSpeedSelectionMode speedSelectionMode = MovementWalkRunSpeedSelectionMode::Default,
Optional<float> closeEnoughDistance = {},
Optional<Scripting::v2::ActionResultSetter<MovementStopReason>>&& scriptResult = {});
PointMovementGenerator(PointMovementGenerator const&) = delete;
PointMovementGenerator(PointMovementGenerator&&) = delete;
PointMovementGenerator& operator=(PointMovementGenerator const&) = delete;
PointMovementGenerator& operator=(PointMovementGenerator&&) = delete;
~PointMovementGenerator();
MovementGeneratorType GetMovementGeneratorType() const override;