From 85df1df3c34115efa0e18d116f7923b88ec1dadf Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 11 Jan 2013 14:24:52 -0800 Subject: SH-3406 WIP convert fast timers to lltrace system gcc 4.1 fixes --- indra/llcommon/llunit.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'indra/llcommon') 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 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) : mValue(convert(other)) {} + + // value initialization + template + LLUnit(CONVERTABLE_TYPE value) + : mValue(value) + {} // value assignment self_t& operator = (storage_t value) -- cgit v1.2.3