diff options
| author | Richard Linden <none@none> | 2012-11-14 23:52:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-14 23:52:27 -0800 |
| commit | 9d77e030d9a0d23cebce616631677459eec1612c (patch) | |
| tree | 94b196b2f89c84144ad8eed89c9bbaf6ddb2e558 /indra/llcommon/llunit.h | |
| parent | 67ec47e6da389661934ed2ddfa55ca58455fa7e5 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
Diffstat (limited to 'indra/llcommon/llunit.h')
| -rw-r--r-- | indra/llcommon/llunit.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index 4ac2197c11..1fe492fdce 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -33,18 +33,12 @@ namespace LLUnits { -template<typename T, typename IS_UNIT = void> +template<typename T> struct HighestPrecisionType { typedef T type_t; }; -template<typename T> -struct HighestPrecisionType<T, typename T::is_unit_tag_t> -{ - typedef typename HighestPrecisionType<typename T::storage_t>::type_t type_t; -}; - template<> struct HighestPrecisionType<F32> { typedef F64 type_t; }; template<> struct HighestPrecisionType<S32> { typedef S64 type_t; }; template<> struct HighestPrecisionType<U32> { typedef S64 type_t; }; @@ -78,7 +72,6 @@ struct LLUnit { typedef LLUnit<UNIT_TYPE, STORAGE_TYPE> self_t; typedef typename STORAGE_TYPE storage_t; - typedef void is_unit_tag_t; LLUnit(storage_t value = storage_t()) : mValue(value) |