Get rid of Trinity Singleton and Threading patterns and replace them with ACE_Singletons and ACE_GUARD_x macro´s with ACE_Thread_Mutex´es respectively.

Also get rid of unused CountedReference class that used Trinity threading pattern.

--HG--
branch : trunk

1 files changed, 4 insertions, 6 deletions

diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index eaf8e1acd2d..11052a9f0a7 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -23,7 +23,7 @@
 
 #include "Define.h"
 #include "Dynamic/UnorderedMap.h"
-#include "Policies/Singleton.h"
+#include "ace/Singleton.h"
 
 #include <string>
 #include <vector>
@@ -94,11 +94,6 @@ class ObjectRegistry
             return i_registeredObjects;
         }
 
-    private:
-        RegistryMapType i_registeredObjects;
-        friend class Trinity::OperatorNew<ObjectRegistry<T, Key> >;
-
-        // protected for friend use since it should be a singleton
         ObjectRegistry() {}
         ~ObjectRegistry()
         {
@@ -106,6 +101,9 @@ class ObjectRegistry
                 delete iter->second;
             i_registeredObjects.clear();
         }
+    private:
+        RegistryMapType i_registeredObjects;
+        
 };
 #endif