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

SH-3406 WIP convert fast timers to lltrace system 

gcc 4.1 fixes
master
Richard Linden 2013-01-11 14:24:52 -08:00
parent dd54893bcf
commit 85df1df3c3
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llcommon/llunit.h
View File

@ -75,9 +75,9 @@ struct LLUnit
typedef LLUnit<UNIT_TYPE, STORAGE_TYPE> self_t;
typedef STORAGE_TYPE storage_t;
// value initialization
LLUnit(storage_t value = storage_t())
: mValue(value)
// default initialization
LLUnit()
: mValue(storage_t())
{}
// unit initialization and conversion
@ -85,6 +85,12 @@ struct LLUnit
LLUnit(LLUnit<OTHER_UNIT, OTHER_STORAGE> other)
: mValue(convert(other))
{}
// value initialization
template<typename CONVERTABLE_TYPE>
LLUnit(CONVERTABLE_TYPE value)
: mValue(value)
{}
// value assignment
self_t& operator = (storage_t value)

10
indra/newview/llviewerstatsrecorder.cpp
View File

@ -216,7 +216,10 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
<< "Texture Fetch bps\t"
<< "\n";
fwrite(data_msg.str().c_str(), 1, data_msg.str().size(), mObjectCacheFile );
if (fwrite(data_msg.str().c_str(), 1, data_msg.str().size(), mObjectCacheFile ) != data_msg.str().size())
{
llwarns << "Failed to write log file." << llendl;
}
}
else
{
@ -249,7 +252,10 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
<< "\t" << (mTextureFetchSize * 8 / delta_time)
<< "\n";
fwrite(data_msg.str().c_str(), 1, data_msg.str().size(), mObjectCacheFile );
if (fwrite(data_msg.str().c_str(), 1, data_msg.str().size(), mObjectCacheFile ) != data_msg.str().size())
{
llwarns << "Failed to write log file." << llendl;
}
clearStats();
}