Changeset 563 for code/branches/FICN/src/orxonox

Timestamp:

Dec 17, 2007, 4:02:14 AM (17 years ago)

Author:

landauf

Message:

sorry, that was wrong (was just testing)

Location:

code/branches/FICN/src/orxonox/core

Files:

• Factory.cc (modified) (2 diffs)
• Factory.h (modified) (2 diffs)

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

@@ -38 +38 @@
 namespace orxonox
 {
-    Factory* Factory::pointer_s = 0;
-
     /**
         @returns the Identifier with a given name.
@@ -105 +103 @@
     Factory* Factory::getFactoryPointer()
     {
-//        static Factory theOneAndOnlyInstance = Factory();
-//        return &theOneAndOnlyInstance;
-        if (!pointer_s)
-            pointer_s = new Factory();
-
-        return pointer_s;
+      static Factory theOneAndOnlyInstance = Factory();
+      return &theOneAndOnlyInstance;
     }
 }

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

@@ -37 +37 @@
             static void changeNetworkID(Identifier* identifier, const unsigned int oldID, const unsigned int newID);
             static void createClassHierarchy();
+
             static Factory* getFactoryPointer();// avoid overriding pointer_s in the static intialisation process
 
@@ -43 +44 @@
             Factory(const Factory& factory) {}      // don't copy
             ~Factory() {}                           // don't delete
+            static void checkPointer();
 
-            static Factory* pointer_s;
             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