Changeset 693 for code/branches

Timestamp:

Dec 26, 2007, 11:59:27 PM (17 years ago)

Author:

rgrieder

Message:

• new approach to pointer_s problem

File:

• code/branches/FICN/src/orxonox/core/Identifier.h (modified) (5 diffs)

code/branches/FICN/src/orxonox/core/Identifier.h

@@ -194 +194 @@
 
             /** @returns the Identifier itself (createIdentifier() has to be called first). */
-            inline static ClassIdentifier<T>* getIdentifier() { return pointer_s; }
+            inline static ClassIdentifier<T>* getIdentifier()
+            {
+                static ClassIdentifier<T> theOneAndOnlyInstance = ClassIdentifier<T>();
+
+                return &theOneAndOnlyInstance;
+            }
 
         private:
-            ClassIdentifier(const std::string& name);
+            ClassIdentifier();
             ClassIdentifier(const ClassIdentifier<T>& identifier) {} // don't copy
             ~ClassIdentifier();
 
-            static ClassIdentifier<T>* pointer_s;       //!< A pointer to the singleton-object
+            //static ClassIdentifier<T>* pointer_s;       //!< A pointer to the singleton-object
             ObjectList<T>* objects_;                    //!< The ObjectList, containing all objects of type T
     };
 
-    template <class T>
-    ClassIdentifier<T>* ClassIdentifier<T>::pointer_s;
-
     /**
         @brief Constructor: Creates the ObjectList.
@@ -213 +215 @@
     */
     template <class T>
-    ClassIdentifier<T>::ClassIdentifier(const std::string& name)
+    ClassIdentifier<T>::ClassIdentifier()
     {
         this->objects_ = new ObjectList<T>;
-        this->name_ = name;
-        this->identifierMap_s[name] = this;
     }
 
@@ -227 +227 @@
     {
         delete this->objects_;
-        this->pointer_s = NULL;
     }
 
@@ -246 +245 @@
 
         // Check if at least one object of the given type was created
-        if (!pointer_s->bCreatedOneObject_)
+        if (!getIdentifier()->bCreatedOneObject_)
         {
             // If no: We have to store the informations and initialize the Identifier
             COUT(4) << "*** Register Class in " << name << "-Singleton -> Initialize Singleton." << std::endl;
             if (bRootClass)
-                pointer_s->initialize(NULL); // If a class is derived from two interfaces, the second interface might think it's derived from the first because of the order of constructor-calls. Thats why we set parents to zero in that case.
+                getIdentifier()->initialize(NULL); // If a class is derived from two interfaces, the second interface might think it's derived from the first because of the order of constructor-calls. Thats why we set parents to zero in that case.
             else
-                pointer_s->initialize(parents);
+                getIdentifier()->initialize(parents);
         }
 
-        return pointer_s;
+        return getIdentifier();
     }
 
@@ -266 +265 @@
     void ClassIdentifier<T>::createIdentifier(const std::string& name)
     {
-        static bool bFirstCeateIdentifierFunctionCall = true;
-        static ClassIdentifier<T> classIdentifierObject = ClassIdentifier<T>(name);
-
-        if (bFirstCeateIdentifierFunctionCall)
+        static bool bIdentifierCreated = false;
+
+        if (!bIdentifierCreated)
         {
+            getIdentifier()->name_ = name;
+            getIdentifier()->identifierMap_s[name] = getIdentifier();
             COUT(4) << "*** Create Identifier Singleton for " << name << "." << std::endl;
-            pointer_s = &classIdentifierObject;
-            bFirstCeateIdentifierFunctionCall = false;
+            bIdentifierCreated = true;
         }
     }