From 9d70448a1275b80a829e16b6d08d29919748c823 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 7 Nov 2012 00:43:56 -0800 Subject: SH-3499 WIP Ensure asset stats output is correct removed explicit constructor of LLUnit from integral types, as C++ already guarantees that I can't convert from LLUnit to LLUnits (requires 2 user defined conversions). Now this allows seamless replacement of existing integral types with Unit labeled types. --- indra/llcommon/llunit.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index e778383959..98e4de32fa 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -41,7 +41,7 @@ struct LLUnitType : public BASE_UNIT LLUnitType() {} - explicit LLUnitType(storage_t value) + LLUnitType(storage_t value) : BASE_UNIT(convertToBase(value)) {} @@ -86,7 +86,7 @@ struct LLUnitType : mBaseValue() {} - explicit LLUnitType(storage_t value) + LLUnitType(storage_t value) : mBaseValue(value) {} -- cgit v1.2.3