Changeset 686

Timestamp:

Dec 26, 2007, 7:22:06 PM (16 years ago)

Author:

rgrieder

Message:

• replaced a little hack in DebugLevel through a tiny one.

Location:

code/branches/FICN

Files:

• src/orxonox/core/DebugLevel.cc (modified) (3 diffs)
• src/orxonox/core/DebugLevel.h (modified) (1 diff)
• visual_studio/base_properties.vsprops (modified) (1 diff)
• visual_studio/core.vcproj (modified) (2 diffs)

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

@@ -37 +37 @@
 namespace orxonox
 {
-    DebugLevel* DebugLevel::pointer_s = 0;                // Set the static member variable pointer_s to zero
-    bool DebugLevel::bCreatingDebugLevelObject_s = false; // Set the static member variable bCreatingDebugLevelObject_s to false
-
     /**
         @brief Constructor: Registers the object and sets the debug level.
@@ -45 +42 @@
     DebugLevel::DebugLevel()
     {
+        this->softDebugLevel_ = 4;   // accounts for the recursive call when creating the object
         RegisterRootObject(DebugLevel);
-        SetConfigValue(softDebugLevel_s, 2);
+        SetConfigValue(softDebugLevel_, 2);
     }
 
@@ -54 +52 @@
     int DebugLevel::getSoftDebugLevel()
     {
-        if (!pointer_s && !bCreatingDebugLevelObject_s)
-        {
-            // We need the bCreatingDebugLevelObject_s variable to avoid an infinite recursion:
-            // Creating the object produces debug output and debug output needs the object.
-            bCreatingDebugLevelObject_s = true;
-            pointer_s = new DebugLevel;
-            bCreatingDebugLevelObject_s = false;
-        }
-        else if (bCreatingDebugLevelObject_s)
-            return 4;
-
-        return pointer_s->softDebugLevel_s;
+        static DebugLevel theOneAndOnlyInstance = DebugLevel();
+        return theOneAndOnlyInstance.softDebugLevel_;
     }
 }

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

@@ -54 +54 @@
             ~DebugLevel() {}                    // don't delete
 
-            int softDebugLevel_s;                       //!< The output level
-            static DebugLevel* pointer_s;               //!< A pointer to the only existing instance of this class
-            static bool bCreatingDebugLevelObject_s;    //!< True if the only instance is being created (this is needed to avoid recurstion - creating the object produces debug output, debug output needs the object)
+            int softDebugLevel_;                //!< The output level
     };
 }

code/branches/FICN/visual_studio/base_properties.vsprops

@@ -11 +11 @@
                 AdditionalIncludeDirectories=""$(SolutionDir)\..\src";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\OgreMain\include";"$(ORXONOX_HOME)\dependencies\include""
                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK"
-                WarningLevel="3"
+                WarningLevel="2"
                 Detect64BitPortabilityProblems="true"
                 DebugInformationFormat="3"

code/branches/FICN/visual_studio/core.vcproj

@@ -191 +191 @@
                         </File>
                         <File
+                                RelativePath="..\src\orxonox\core\OutputHandler.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\orxonox\core\SignalHandler.cc"
                                 >
@@ -261 +265 @@
                         </File>
                         <File
+                                RelativePath="..\src\orxonox\core\OutputHandler.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\orxonox\core\SignalHandler.h"
                                 >