livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUILDFIX: gcc fixes

master
Richard Linden 2013-08-14 17:22:29 -07:00
parent d2bd23fdd0
commit da030893dd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llcommon/llerror.cpp
View File

@ -449,7 +449,7 @@ namespace LLError
mTimeFunction(NULL),
mFileRecorder(NULL),
mFixedBufferRecorder(NULL),
mShouldLogCallCounter(NULL)
mShouldLogCallCounter(0)
{}
~Settings()
@ -548,12 +548,12 @@ namespace LLError
#else
#if LL_LINUX
// gross, but typeid comparison seems to always fail here with gcc4.1
if (0 != strcmp(site.mClassInfo.name(), typeid(NoClassInfo).name()))
if (0 != strcmp(mClassInfo.name(), typeid(NoClassInfo).name()))
#else
if (site.mClassInfo != typeid(NoClassInfo))
if (mClassInfo != typeid(NoClassInfo))
#endif // LL_LINUX
{
mFunctionString = className(site.mClassInfo) + "::";
mFunctionString = className(mClassInfo) + "::";
}
#endif
mFunctionString += std::string(mFunction) + ":";
@ -1065,8 +1065,8 @@ namespace LLError
s.mShouldLogCallCounter++;
std::string& class_name = className(site.mClassInfo);
std::string& function_name = functionName(site.mFunction);
const std::string& class_name = className(site.mClassInfo);
std::string function_name = functionName(site.mFunction);
#if LL_LINUX
// gross, but typeid comparison seems to always fail here with gcc4.1
if (0 != strcmp(site.mClassInfo.name(), typeid(NoClassInfo).name()))