Core/Misc: Kill copy/move constructors for singleton classes

2 files changed, 11 insertions, 2 deletions

diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index ffb984fb4af..0785ea7869c 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -25,6 +25,9 @@
 #include "TemporarySummon.h"
 #include "Unit.h"
 
+WaypointMgr::WaypointMgr() = default;
+WaypointMgr::~WaypointMgr() = default;
+
 void WaypointMgr::LoadPaths()
 {
     _LoadPaths();
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h
index 721f79d76a6..31169de46a1 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.h
+++ b/src/server/game/Movement/Waypoints/WaypointManager.h
@@ -19,7 +19,7 @@
 #define TRINITY_WAYPOINTMANAGER_H
 
 #include "Define.h"
-#include "Field.h"
+#include "DatabaseEnvFwd.h"
 #include "Hash.h"
 #include "ObjectGuid.h"
 #include "Position.h"
@@ -31,6 +31,11 @@ class Unit;
 class TC_GAME_API WaypointMgr
 {
     public:
+        WaypointMgr(WaypointMgr const&) = delete;
+        WaypointMgr(WaypointMgr&&) = delete;
+        WaypointMgr& operator=(WaypointMgr const&) = delete;
+        WaypointMgr& operator=(WaypointMgr&&) = delete;
+
         static WaypointMgr* instance();
 
         // Attempts to reload a single path from database
@@ -57,7 +62,8 @@ class TC_GAME_API WaypointMgr
         ObjectGuid const& GetVisualGUIDByNode(uint32 pathId, uint32 nodeId) const;
 
     private:
-        WaypointMgr() { }
+        WaypointMgr();
+        ~WaypointMgr();
 
         void _LoadPaths();
         void _LoadPathNodes();