diff options
| author | Richard Linden <none@none> | 2013-01-11 15:45:20 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 15:45:20 -0800 |
| commit | 512d7381eca7bc53bb31e9528e5a7c5df189e82d (patch) | |
| tree | c1b40f075c61991770b67cb7aec8a37af6bfa6e2 /indra/llcommon | |
| parent | 85df1df3c34115efa0e18d116f7923b88ec1dadf (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 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index c43ca2ba18..f43df3753a 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -76,8 +76,8 @@ struct LLUnit typedef STORAGE_TYPE storage_t; // default initialization - LLUnit() - : mValue(storage_t()) + LLUnit(storage_t value = storage_t()) + : mValue(value) {} // unit initialization and conversion @@ -85,12 +85,6 @@ 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) |