aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/compiler/clang/settings.cmake4
-rw-r--r--src/common/Utilities/Util.h9
-rw-r--r--src/server/bnetserver/REST/LoginRESTService.cpp1
-rw-r--r--src/server/game/Entities/Object/Position.h9
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Guilds/GuildFinderMgr.h12
-rw-r--r--src/server/game/Movement/Spline/MoveSplineFlag.h1
-rw-r--r--src/server/shared/Dynamic/LinkedList.h6
8 files changed, 10 insertions, 34 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake
index d42345541ee..17a85f259ed 100644
--- a/cmake/compiler/clang/settings.cmake
+++ b/cmake/compiler/clang/settings.cmake
@@ -12,7 +12,8 @@ if(WITH_WARNINGS)
-Winit-self
-Wfatal-errors
-Wno-mismatched-tags
- -Woverloaded-virtual)
+ -Woverloaded-virtual
+ -Wno-deprecated-copy) # warning in g3d
message(STATUS "Clang: All warnings enabled")
endif()
@@ -27,6 +28,7 @@ endif()
# -Wno-narrowing needed to suppress a warning in g3d
# -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
+# -Wno-deprecated-copy needed to suppress a warning in g3d
target_compile_options(trinity-compile-option-interface
INTERFACE
-Wno-narrowing
diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h
index a18fd16ad15..5711397f904 100644
--- a/src/common/Utilities/Util.h
+++ b/src/common/Utilities/Util.h
@@ -412,15 +412,6 @@ public:
return !this->operator ==(right);
}
- inline flag128 & operator =(const flag128 &right)
- {
- part[0] = right.part[0];
- part[1] = right.part[1];
- part[2] = right.part[2];
- part[3] = right.part[3];
- return *this;
- }
-
inline flag128 operator &(const flag128 &right) const
{
return flag128(part[0] & right.part[0], part[1] & right.part[1],
diff --git a/src/server/bnetserver/REST/LoginRESTService.cpp b/src/server/bnetserver/REST/LoginRESTService.cpp
index 5ea40fc8267..9afaeb5df8c 100644
--- a/src/server/bnetserver/REST/LoginRESTService.cpp
+++ b/src/server/bnetserver/REST/LoginRESTService.cpp
@@ -82,7 +82,6 @@ bool LoginRESTService::Start(Trinity::Asio::IoContext* ioContext)
_port = 8081;
}
- boost::system::error_code ec;
boost::asio::ip::tcp::resolver resolver(*ioContext);
std::string configuredAddress = sConfigMgr->GetStringDefault("LoginREST.ExternalAddress", "127.0.0.1");
diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h
index f247c7fb860..3268000121b 100644
--- a/src/server/game/Entities/Object/Position.h
+++ b/src/server/game/Entities/Object/Position.h
@@ -60,6 +60,12 @@ private:
float m_orientation;
public:
+ Position& operator=(Position const& loc)
+ {
+ Relocate(loc);
+ return *this;
+ }
+
bool operator==(Position const &a) const;
inline bool operator!=(Position const &a) const
@@ -242,9 +248,6 @@ public:
WorldLocation(uint32 mapId, Position const& position)
: Position(position), m_mapId(mapId) { }
- WorldLocation(WorldLocation const& loc)
- : Position(loc), m_mapId(loc.GetMapId()) { }
-
void WorldRelocate(WorldLocation const& loc)
{
m_mapId = loc.GetMapId();
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 5f2199d9f52..ecae26fae8f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -23180,7 +23180,7 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorguid, uint32 vendorslot, uin
uint64 price = 0;
if (crItem->IsGoldRequired(pProto) && pProto->GetBuyPrice() > 0) //Assume price cannot be negative (do not know why it is int32)
{
- float buyPricePerItem = float(pProto->GetBuyPrice()) / pProto->GetBuyCount();
+ double buyPricePerItem = double(pProto->GetBuyPrice()) / pProto->GetBuyCount();
uint64 maxCount = MAX_MONEY_AMOUNT / buyPricePerItem;
if ((uint64)count > maxCount)
{
diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h
index 6667b841f11..ff20c29a413 100644
--- a/src/server/game/Guilds/GuildFinderMgr.h
+++ b/src/server/game/Guilds/GuildFinderMgr.h
@@ -118,15 +118,6 @@ struct LFGuildPlayer
_level = level;
}
- LFGuildPlayer(LFGuildPlayer const& settings) : _comment(settings.GetComment())
- {
- _guid = settings.GetGUID();
- _roles = settings.GetClassRoles();
- _availability = settings.GetAvailability();
- _interests = settings.GetInterests();
- _level = settings.GetLevel();
- }
-
ObjectGuid const& GetGUID() const { return _guid; }
uint8 GetClassRoles() const { return _roles; }
uint8 GetAvailability() const { return _availability; }
@@ -157,9 +148,6 @@ struct LFGuildSettings : public LFGuildPlayer
LFGuildSettings(bool listed, TeamId team, ObjectGuid const& guid, uint8 role, uint8 availability, uint8 interests, uint8 level, std::string& comment) :
LFGuildPlayer(guid, role, availability, interests, level, comment), _listed(listed), _team(team) {}
- LFGuildSettings(LFGuildSettings const& settings) :
- LFGuildPlayer(settings), _listed(settings.IsListed()), _team(settings.GetTeam()) {}
-
bool IsListed() const { return _listed; }
void SetListed(bool state) { _listed = state; }
diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h
index dfea07e8b68..10f0fb8648e 100644
--- a/src/server/game/Movement/Spline/MoveSplineFlag.h
+++ b/src/server/game/Movement/Spline/MoveSplineFlag.h
@@ -75,7 +75,6 @@ namespace Movement
MoveSplineFlag() { raw() = 0; }
MoveSplineFlag(uint32 f) { raw() = f; }
- MoveSplineFlag(const MoveSplineFlag& f) { raw() = f.raw(); }
// Constant interface
diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h
index 2d0596a048a..a9bcb2ea98f 100644
--- a/src/server/shared/Dynamic/LinkedList.h
+++ b/src/server/shared/Dynamic/LinkedList.h
@@ -164,12 +164,6 @@ class LinkedListHead
{ // construct with node pointer _Pnode
}
- Iterator& operator=(Iterator const &_Right)
- {
- _Ptr = _Right._Ptr;
- return *this;
- }
-
Iterator& operator=(const_pointer const &_Right)
{
_Ptr = pointer(_Right);