Changeset 562 for code/branches

Timestamp:

Dec 17, 2007, 3:58:42 AM (17 years ago)

Author:

landauf

Message:

modified DebugLevel-hack

Location:

code/branches/FICN/src/orxonox/core

Files:

• DebugLevel.cc (modified) (2 diffs)
• DebugLevel.h (modified) (1 diff)
• Factory.cc (modified) (2 diffs)
• Factory.h (modified) (2 diffs)

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

@@ -5 +5 @@
 namespace orxonox
 {
-    int DebugLevel::softDebugLevel_s;
-
-//    CreateFactory(DebugLevel);
+    DebugLevel* DebugLevel::pointer_s = 0;
+    bool DebugLevel::bCreatingDebugLevelObject_s = false;
 
     DebugLevel::DebugLevel()
     {
-        RegisterObject(DebugLevel);
+        RegisterRootObject(DebugLevel);
         SetConfigValue(softDebugLevel_s, 2);
     }
@@ -17 +16 @@
     int DebugLevel::getSoftDebugLevel()
     {
-        return DebugLevel::softDebugLevel_s;
+        if (!pointer_s && !bCreatingDebugLevelObject_s)
+        {
+            bCreatingDebugLevelObject_s = true;
+            pointer_s = new DebugLevel;
+            bCreatingDebugLevelObject_s = false;
+        }
+
+        if (bCreatingDebugLevelObject_s)
+            return 4;
+
+        return pointer_s->softDebugLevel_s;
     }
 }

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

@@ -13 +13 @@
 
         private:
-            static int softDebugLevel_s;
-    } myDebugObject;
+            int softDebugLevel_s;
+            static DebugLevel* pointer_s;
+            static bool bCreatingDebugLevelObject_s;
+    };
 }
 

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

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

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
 
@@ -44 +43 @@
             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