Changeset 8775 for code/branches

Timestamp:

Jul 25, 2011, 12:01:30 AM (13 years ago)

Author:

landauf

Message:

fixed problem with static initialization in old implementation of the log file

File:

• code/branches/output/src/libraries/util/OutputHandler.cc (modified) (4 diffs)

code/branches/output/src/libraries/util/OutputHandler.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    //! How the log file shall be named on the filesystem
-    const std::string logFileBaseName_g = "orxonox.log";
-
     /////////////////////////
     ///// LogFileWriter /////
@@ -71 +68 @@
             : OutputListener("LogFile")
         {
+            this->logFileBaseName_ = "orxonox.log";
+
             // Get path for a temporary file
 #ifdef ORXONOX_PLATFORM_WINDOWS
             char* pTempDir = getenv("TEMP");
-            this->logFilename_ = std::string(pTempDir) + '/' + logFileBaseName_g;
+            this->logFilename_ = std::string(pTempDir) + '/' + this->logFileBaseName_;
 #else
-            this->logFilename_ = std::string("/tmp/") + logFileBaseName_g;
+            this->logFilename_ = std::string("/tmp/") + this->logFileBaseName_;
 #endif
 
@@ -110 +109 @@
 
             // Open the new file
-            this->logFilename_ = path + logFileBaseName_g;
+            this->logFilename_ = path + this->logFileBaseName_;
             this->openFile();
         }
@@ -138 +137 @@
         }
 
-        std::ofstream logFile_;     //!< File handle for the log file
-        std::string   logFilename_; //!< Filename of the log file
+        std::ofstream logFile_;         //!< File handle for the log file
+        std::string   logFilename_;     //!< Filename of the log file
+        std::string   logFileBaseName_; //!< How the log file shall be named on the filesystem
     };