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/llcommon | |
| parent | dd54893bcf50f41e5c678b6ca67b646284b94fca (diff) | |
SH-3406 WIP convert fast timers to lltrace system
gcc 4.1 fixes
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llunit.h | 12 |
1 files changed, 9 insertions, 3 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) |