From 57859636cd0a5b9d6d3cb46f0c984bc8702c03ae Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 26 Dec 2015 17:49:54 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- .../driver/opengl/driver_opengl_extension.cpp | 2 +- code/nel/src/misc/common.cpp | 18 ------------------ code/nel/src/misc/displayer.cpp | 11 ----------- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index 700780077..37099eab6 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -536,7 +536,7 @@ PFNGLXFREEMEMORYNVPROC nglXFreeMemoryNV; // Swap control extensions PFNGLXSWAPINTERVALEXTPROC nglXSwapIntervalEXT; -PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI; +PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI; PFNGLXSWAPINTERVALMESAPROC nglXSwapIntervalMESA; PFNGLXGETSWAPINTERVALMESAPROC nglXGetSwapIntervalMESA; diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index d2d2e5cb0..698f9d9ee 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -687,24 +687,6 @@ bool launchProgram(const std::string &programName, const std::string &arguments, si.cb = sizeof(si); -/* SECURITY_ATTRIBUTES sa; - sa.nLength = sizeof (sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = FALSE; - - STARTUPINFO si; - si.cb = sizeof (si); - si.lpReserved = NULL; - si.lpDesktop = NULL; - si.lpTitle = NULL; - si.dwFlags = STARTF_USESHOWWINDOW; - si.cbReserved2 = 0; - si.wShowWindow = SW_MINIMIZE; - si.lpReserved2 = NULL; - - PROCESS_INFORMATION pi; -*/ - // Enable nlassert/nlstop to display the error reason & callstack const TCHAR *SE_TRANSLATOR_IN_MAIN_MODULE = _T("NEL_SE_TRANS"); TCHAR envBuf [2]; diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp index e1738592c..60fa244b6 100644 --- a/code/nel/src/misc/displayer.cpp +++ b/code/nel/src/misc/displayer.cpp @@ -520,10 +520,7 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes // in release "" void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message) { -//#ifdef NL_OS_WINDOWS - bool needSpace = false; -// stringstream ss; string str; // create the string for the clipboard @@ -536,7 +533,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m if (args.LogType != CLog::LOG_NO) { - //if (needSpace) { ss << " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; } str += logTypeToString(args.LogType); needSpace = true; @@ -544,7 +540,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m if (!args.ProcessName.empty()) { - //if (needSpace) { ss << " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; } str += args.ProcessName; needSpace = true; @@ -552,7 +547,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m if (args.FileName != NULL) { - //if (needSpace) { ss << " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; } str += CFile::getFilename(args.FileName); needSpace = true; @@ -560,7 +554,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m if (args.Line != -1) { - //if (needSpace) { ss << " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; } str += NLMISC::toString(args.Line); needSpace = true; @@ -568,7 +561,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m if (args.FuncName != NULL) { - //if (needSpace) { ss << " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; } str += args.FuncName; needSpace = true; @@ -582,7 +574,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m // create the string on the screen needSpace = false; -// stringstream ss2; string str2; #ifdef NL_DEBUG @@ -709,8 +700,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m setCrashAlreadyReported(true); } } - -//#endif }