Changeset 553 for code/branches/FICN/src/orxonox/core/Factory.h

Timestamp:

Dec 17, 2007, 1:19:13 AM (16 years ago)

Author:

rgrieder

Message:

• some minor change in static initialisation of factory (this concept could be adopted to the other singletons in the factory as well)

File:

• code/branches/FICN/src/orxonox/core/Factory.h (modified) (1 diff)

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

@@ -38 +38 @@
             static void createClassHierarchy();
 
+            static Factory* getFactoryPointer();// avoid overriding pointer_s in the static intialisation process
+
         private:
             Factory() {}                            // don't create
             Factory(const Factory& factory) {}      // don't copy
             ~Factory() {}                           // don't delete
+            static void checkPointer();
 
-            /**
-                @brief Checks if the pointer to the only Factory-object exists and creates it, if not.
-            */
-            inline static void checkPointer()
-            {
-                if (!pointer_s)
-                    pointer_s = new Factory;
-            }
-
-            static Factory* pointer_s;                                          //!< The pointer to the singleton
             std::map<std::string, Identifier*> identifierStringMap_;            //!< The map, mapping the name with the Identifier
             std::map<unsigned int, Identifier*> identifierNetworkIDMap_;        //!< The map, mapping the network ID with the Identifier