diff options
| author | Richard Linden <none@none> | 2013-01-11 14:24:52 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 14:24:52 -0800 |
| commit | 85df1df3c34115efa0e18d116f7923b88ec1dadf (patch) | |
| tree | 684f2b92e4610c3d2eb09ddb71bec90f518bc834 /indra | |
| parent | dd54893bcf50f41e5c678b6ca67b646284b94fca (diff) | |
SH-3406 WIP convert fast timers to lltrace system
gcc 4.1 fixes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llunit.h | 12 | ||||
| -rw-r--r-- | indra/newview/llviewerstatsrecorder.cpp | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index c600883607..c43ca2ba18 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -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) diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp index 91e485d01b..cdb7bde123 100644 --- a/indra/newview/llviewerstatsrecorder.cpp +++ b/indra/newview/llviewerstatsrecorder.cpp @@ -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(); } |