Second Life viewer sources 1.21.0-RC

1 files changed, 4 insertions, 9 deletions

diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp
index 3f0364b..7607315 100644
--- a/linden/indra/newview/llwindebug.cpp
+++ b/linden/indra/newview/llwindebug.cpp
@@ -31,8 +31,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#ifdef LL_WINDOWS
-
 #include <tchar.h>
 #include <tlhelp32.h>
 #include "llwindebug.h"
@@ -488,7 +486,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
                 
                 // Save instruction that caused exception.
                 /*
-                LLString str;
+                std::string str;
                 for (i = 0; i < 16; i++)
                         str += llformat(" %02X", PBYTE(E.ExceptionAddress)[i]);
                 info["Instruction"] = str;
@@ -641,7 +639,7 @@ bool LLWinDebug::checkExceptionHandler()
         return ok;
 }
 
-void LLWinDebug::writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const char *filename)
+void LLWinDebug::writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename)
 {
         if(f_mdwp == NULL || gDirUtilp == NULL) 
         {
@@ -650,8 +648,7 @@ void LLWinDebug::writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMAT
         }
         else
         {
-                std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-                                                                                                                                           filename);
+                std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, filename);
 
                 HANDLE hFile = CreateFileA(dump_path.c_str(),
                                                                         GENERIC_WRITE,
@@ -736,9 +733,7 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop
 
     info["Threads"] = threads;
 
-        std::ofstream out_file(log_path.c_str());
+        llofstream out_file(log_path);
         LLSDSerialize::toPrettyXML(info, out_file);
         out_file.close();
 }
-
-#endif