From f4c6a4ce27e54cf8bfe1e755ffa2c5df138a003f Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Fri, 4 Feb 2022 19:00:33 +0100 Subject: [PATCH] fix(Core/Misc): Remove c++ check for c++11 (#10439) --- src/common/Utilities/Util.h | 3 --- src/server/game/Entities/Object/Object.h | 3 --- src/server/game/Entities/Unit/Unit.h | 3 --- src/server/game/Movement/Spline/MoveSplineFlag.h | 3 --- 4 files changed, 12 deletions(-) diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index f2bbee6cf..ec65748c4 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -510,11 +510,8 @@ public: part[2] = right.part[2]; return *this; } - /* requried as of C++ 11 */ -#if __cplusplus >= 201103L flag96(const flag96&) = default; flag96(flag96&&) = default; -#endif inline flag96 operator&(flag96 const& right) const { diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index d01a8c72c..9a14e4a8e 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -250,12 +250,9 @@ struct Position : m_positionX(x), m_positionY(y), m_positionZ(z), m_orientation(NormalizeOrientation(o)) { } Position(Position const& loc) { Relocate(loc); } - /* requried as of C++ 11 */ -#if __cplusplus >= 201103L Position(Position&&) = default; Position& operator=(const Position&) = default; Position& operator=(Position&&) = default; -#endif struct PositionXYStreamer { diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 0917ef592..0fba15c07 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1219,12 +1219,9 @@ public: _posOwner.Relocate(c._posOwner); _posTarget.Relocate(c._posTarget); } - /* requried as of C++ 11 */ -#if __cplusplus >= 201103L MMapTargetData(MMapTargetData&&) = default; MMapTargetData& operator=(const MMapTargetData&) = default; MMapTargetData& operator=(MMapTargetData&&) = default; -#endif [[nodiscard]] bool PosChanged(const Position& o, const Position& t) const { return _posOwner.GetExactDistSq(&o) > 0.5f * 0.5f || _posTarget.GetExactDistSq(&t) > 0.5f * 0.5f; diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index 644d2503d..638a921a1 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -79,12 +79,9 @@ namespace Movement MoveSplineFlag() { raw() = 0; } MoveSplineFlag(uint32 f) { raw() = f; } MoveSplineFlag(const MoveSplineFlag& f) { raw() = f.raw(); } - /* requried as of C++ 11 */ -#if __cplusplus >= 201103L MoveSplineFlag(MoveSplineFlag&&) = default; MoveSplineFlag& operator=(const MoveSplineFlag&) = default; MoveSplineFlag& operator=(MoveSplineFlag&&) = default; -#endif // Constant interface