diff options
| author | Richard Linden <none@none> | 2012-11-07 00:43:56 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-07 00:43:56 -0800 |
| commit | 9d70448a1275b80a829e16b6d08d29919748c823 (patch) | |
| tree | 76406a5f03a8c8d5f73896e851b1dc6899b12501 /indra/llcommon/llunit.h | |
| parent | 860ff2f7e2a7fe932dfb7c148f0dbc0067018038 (diff) | |
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<Bytes> to LLUnits<Seconds> (requires 2 user defined
conversions). Now this allows seamless replacement of existing integral types with
Unit labeled types.
Diffstat (limited to 'indra/llcommon/llunit.h')
| -rw-r--r-- | indra/llcommon/llunit.h | 4 |
1 files 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<STORAGE_TYPE, T, T> : mBaseValue() {} - explicit LLUnitType(storage_t value) + LLUnitType(storage_t value) : mBaseValue(value) {} |