diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-01-14 15:28:35 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-01-14 15:28:35 -0800 |
| commit | ea7e6a5174f1bdfc51ada864736d354706534d8b (patch) | |
| tree | c3b6be6d25b33e41ce01edabb6f0bf91ce3afb38 /indra/win_crash_logger | |
| parent | 1269634e21078ad0af12d29c41778039e9f195ec (diff) | |
Some cleanup of string to wstring conversion and vice versa.
Diffstat (limited to 'indra/win_crash_logger')
| -rw-r--r-- | indra/win_crash_logger/llcrashloggerwindows.cpp | 9 | ||||
| -rwxr-xr-x | indra/win_crash_logger/win_crash_logger.cpp | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp index 49c7ade135..f0bc03a9c4 100644 --- a/indra/win_crash_logger/llcrashloggerwindows.cpp +++ b/indra/win_crash_logger/llcrashloggerwindows.cpp @@ -383,18 +383,17 @@ bool LLCrashLoggerWindows::initCrashServer() mPID = options["pid"].asInteger(); mProcName = options["procname"].asString(); - std::wostringstream ws; //Generate a quasi-uniq name for the named pipe. For our purposes //this is unique-enough with least hassle. Worst case for duplicate name //is a second instance of the viewer will not do crash reporting. - ws << mCrashReportPipeStr << mPID; - std::wstring wpipe_name = ws.str(); + std::wstring wpipe_name; + wpipe_name = mCrashReportPipeStr + stringize(mPID); std::wstring wdump_path; - wdump_path.assign(dump_path.begin(), dump_path.end()); + wdump_path = stringize(dump_path); //Pipe naming conventions: http://msdn.microsoft.com/en-us/library/aa365783%28v=vs.85%29.aspx - mCrashHandler = new CrashGenerationServer( (WCHAR *)wpipe_name.c_str(), + mCrashHandler = new CrashGenerationServer( stringize(wpipe_name).c_str(), NULL, &LLCrashLoggerWindows::OnClientConnected, this, NULL, NULL, // &LLCrashLoggerWindows::OnClientDumpRequest, this, diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp index 0078559c24..0f125028a3 100755 --- a/indra/win_crash_logger/win_crash_logger.cpp +++ b/indra/win_crash_logger/win_crash_logger.cpp @@ -28,7 +28,6 @@ #include "stdafx.h" #include <stdlib.h> #include "llcrashloggerwindows.h" -#include <iostream> int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, |