Changeset 563 for code/branches/FICN/src/orxonox/core/Factory.cc

Timestamp:

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

Author:

landauf

Message:

sorry, that was wrong (was just testing)

File:

• code/branches/FICN/src/orxonox/core/Factory.cc (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;
     }
 }