From b23190393248455f04d3a06def030a1ec7efad1e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 4 Sep 2020 13:38:24 +0200
Subject: Core/Misc: Port all the refactors sneaked in master to 3.3.5 include
 cleanup port

---
 src/server/shared/Dynamic/FactoryHolder.h  |  2 +-
 src/server/shared/Dynamic/LinkedList.h     | 10 +++++-----
 src/server/shared/Dynamic/ObjectRegistry.h |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/server/shared/Dynamic')

diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
index 317d50ea9fc..c3d9901c1ef 100644
--- a/src/server/shared/Dynamic/FactoryHolder.h
+++ b/src/server/shared/Dynamic/FactoryHolder.h
@@ -19,8 +19,8 @@
 #define TRINITY_FACTORY_HOLDER
 
 #include "Define.h"
-#include "Dynamic/TypeList.h"
 #include "ObjectRegistry.h"
+#include "TypeList.h"
 
 /** FactoryHolder holds a factory object of a specific type
  */
diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h
index a9bcb2ea98f..0e9e44a2da4 100644
--- a/src/server/shared/Dynamic/LinkedList.h
+++ b/src/server/shared/Dynamic/LinkedList.h
@@ -164,7 +164,7 @@ class LinkedListHead
                 {                                           // construct with node pointer _Pnode
                 }
 
-                Iterator& operator=(const_pointer const &_Right)
+                Iterator& operator=(const_pointer const& _Right)
                 {
                     _Ptr = pointer(_Right);
                     return *this;
@@ -206,22 +206,22 @@ class LinkedListHead
                     return (_Tmp);
                 }
 
-                bool operator==(Iterator const &_Right) const
+                bool operator==(Iterator const& _Right) const
                 {                                           // test for iterator equality
                     return (_Ptr == _Right._Ptr);
                 }
 
-                bool operator!=(Iterator const &_Right) const
+                bool operator!=(Iterator const& _Right) const
                 {                                           // test for iterator inequality
                     return (!(*this == _Right));
                 }
 
-                bool operator==(pointer const &_Right) const
+                bool operator==(pointer const& _Right) const
                 {                                           // test for pointer equality
                     return (_Ptr != _Right);
                 }
 
-                bool operator!=(pointer const &_Right) const
+                bool operator!=(pointer const& _Right) const
                 {                                           // test for pointer equality
                     return (!(*this == _Right));
                 }
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index 973c34fda24..8e501db9eef 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -81,6 +81,8 @@ class ObjectRegistry final
         // non instanceable, only static
         ObjectRegistry() { }
         ~ObjectRegistry() { }
+        ObjectRegistry(ObjectRegistry const&) = delete;
+        ObjectRegistry& operator=(ObjectRegistry const&) = delete;
 };
 
 #endif
-- 
cgit v1.2.3