Changeset 9645 for code/branches/core6/src/libraries/core

Timestamp:

Aug 13, 2013, 9:39:30 PM (11 years ago)

Author:

landauf

Message:

classIdentifier_s exists in multiple libraries - reset it everywhere if the Identifier is destroyed.

File:

• code/branches/core6/src/libraries/core/class/Identifier.h (modified) (4 diffs)

code/branches/core6/src/libraries/core/class/Identifier.h

@@ -85 +85 @@
 #include "core/object/Listable.h"
 #include "core/object/Context.h"
+#include "core/object/Destroyable.h"
+#include "core/object/WeakPtr.h"
 #include "IdentifierManager.h"
 #include "Super.h"
@@ -104 +106 @@
         @note You can't directly create an Identifier, it's just the base-class of ClassIdentifier<T>.
     */
-    class _CoreExport Identifier
+    class _CoreExport Identifier : public Destroyable
     {
         public:
@@ -300 +302 @@
             {
                 SuperFunctionDestruction<0, T>::destroy(this);
-                if (classIdentifier_s == this)
-                    classIdentifier_s = 0;
             }
 
@@ -308 +308 @@
 
             std::string typeidName_;
-            static ClassIdentifier<T>* classIdentifier_s;
+            static WeakPtr<ClassIdentifier<T> > classIdentifier_s;
     };
 
     template <class T>
-    ClassIdentifier<T>* ClassIdentifier<T>::classIdentifier_s = 0;
+    WeakPtr<ClassIdentifier<T> > ClassIdentifier<T>::classIdentifier_s;
 
     /**