Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
indra/newview/llappviewerwin32.cpp
View File

@@ -79,7 +79,7 @@
extern "C" {
void _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line)
{
llerrs << _Message << llendl;
LL_ERRS() << _Message << LL_ENDL;
}
}
#endif
@@ -95,7 +95,7 @@ void nvapi_error(NvAPI_Status status)
{
NvAPI_ShortString szDesc = {0};
NvAPI_GetErrorMessage(status, szDesc);
llwarns << szDesc << llendl;
LL_WARNS() << szDesc << LL_ENDL;
//should always trigger when asserts are enabled
//llassert(status == NVAPI_OK);
@@ -247,7 +247,7 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
bool ok = viewer_app_ptr->init();
if(!ok)
{
llwarns << "Application init failed." << llendl;
LL_WARNS() << "Application init failed." << LL_ENDL;
return -1;
}
@@ -275,12 +275,12 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
// Have to wait until after logging is initialized to display LFH info
if (num_heaps > 0)
{
llinfos << "Attempted to enable LFH for " << num_heaps << " heaps." << llendl;
LL_INFOS() << "Attempted to enable LFH for " << num_heaps << " heaps." << LL_ENDL;
for(S32 i = 0; i < num_heaps; i++)
{
if (heap_enable_lfh_error[i])
{
llinfos << " Failed to enable LFH for heap: " << i << " Error: " << heap_enable_lfh_error[i] << llendl;
LL_INFOS() << " Failed to enable LFH for heap: " << i << " Error: " << heap_enable_lfh_error[i] << LL_ENDL;
}
}
}
@@ -299,14 +299,14 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
// app cleanup if there was a problem.
//
#if WINDOWS_CRT_MEM_CHECKS
llinfos << "CRT Checking memory:" << llendflush;
LL_INFOS() << "CRT Checking memory:" << LL_ENDL;
if (!_CrtCheckMemory())
{
llwarns << "_CrtCheckMemory() failed at prior to cleanup!" << llendflush;
LL_WARNS() << "_CrtCheckMemory() failed at prior to cleanup!" << LL_ENDL;
}
else
{
llinfos << " No corruption detected." << llendflush;
LL_INFOS() << " No corruption detected." << LL_ENDL;
}
#endif
@@ -315,14 +315,14 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
viewer_app_ptr->cleanup();
#if WINDOWS_CRT_MEM_CHECKS
llinfos << "CRT Checking memory:" << llendflush;
LL_INFOS() << "CRT Checking memory:" << LL_ENDL;
if (!_CrtCheckMemory())
{
llwarns << "_CrtCheckMemory() failed after cleanup!" << llendflush;
LL_WARNS() << "_CrtCheckMemory() failed after cleanup!" << LL_ENDL;
}
else
{
llinfos << " No corruption detected." << llendflush;
LL_INFOS() << " No corruption detected." << LL_ENDL;
}
#endif
@@ -393,11 +393,11 @@ void LLAppViewerWin32::disableWinErrorReporting()
if( 0 == pAddERExcludedApplicationA( executable_name ) )
{
U32 error_code = GetLastError();
llinfos << "AddERExcludedApplication() failed with error code " << error_code << llendl;
LL_INFOS() << "AddERExcludedApplication() failed with error code " << error_code << LL_ENDL;
}
else
{
llinfos << "AddERExcludedApplication() success for " << executable_name << llendl;
LL_INFOS() << "AddERExcludedApplication() success for " << executable_name << LL_ENDL;
}
}
FreeLibrary( fault_rep_dll_handle );
@@ -428,7 +428,7 @@ void create_console()
h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
if (h_con_handle == -1)
{
llwarns << "create_console() failed to open stdout handle" << llendl;
LL_WARNS() << "create_console() failed to open stdout handle" << LL_ENDL;
}
else
{
@@ -442,7 +442,7 @@ void create_console()
h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
if (h_con_handle == -1)
{
llwarns << "create_console() failed to open stdin handle" << llendl;
LL_WARNS() << "create_console() failed to open stdin handle" << LL_ENDL;
}
else
{
@@ -456,7 +456,7 @@ void create_console()
h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
if (h_con_handle == -1)
{
llwarns << "create_console() failed to open stderr handle" << llendl;
LL_WARNS() << "create_console() failed to open stderr handle" << LL_ENDL;
}
else
{
@@ -485,7 +485,7 @@ bool LLAppViewerWin32::init()
// (Don't send our data to Microsoft--at least until we are Logo approved and have a way
// of getting the data back from them.)
//
// llinfos << "Turning off Windows error reporting." << llendl;
// LL_INFOS() << "Turning off Windows error reporting." << LL_ENDL;
disableWinErrorReporting();
#ifndef LL_RELEASE_FOR_DOWNLOAD
@@ -660,7 +660,7 @@ bool LLAppViewerWin32::sendURLToOtherInstance(const std::string& url)
if (other_window != NULL)
{
lldebugs << "Found other window with the name '" << getWindowTitle() << "'" << llendl;
LL_DEBUGS() << "Found other window with the name '" << getWindowTitle() << "'" << LL_ENDL;
COPYDATASTRUCT cds;
const S32 SLURL_MESSAGE_TYPE = 0;
cds.dwData = SLURL_MESSAGE_TYPE;
@@ -668,8 +668,8 @@ bool LLAppViewerWin32::sendURLToOtherInstance(const std::string& url)
cds.lpData = (void*)url.c_str();
LRESULT msg_result = SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
lldebugs << "SendMessage(WM_COPYDATA) to other window '"
<< getWindowTitle() << "' returned " << msg_result << llendl;
LL_DEBUGS() << "SendMessage(WM_COPYDATA) to other window '"
<< getWindowTitle() << "' returned " << msg_result << LL_ENDL;
return true;
}
return false;
@@ -701,7 +701,7 @@ std::string LLAppViewerWin32::generateSerialNumber()
}
else
{
llwarns << "GetVolumeInformation failed" << llendl;
LL_WARNS() << "GetVolumeInformation failed" << LL_ENDL;
}
return serial_md5;
}