diff options
| author | Richard Linden <none@none> | 2013-08-27 13:41:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-27 13:41:19 -0700 |
| commit | a7aed07a5b620977fb74e4070e432eef01d11d3c (patch) | |
| tree | fad55eec609b298b066384e91ccf6425af8a53af /indra/llcommon/tests/lltrace_test.cpp | |
| parent | 7ab616c18786afcb40ab0092fe6f8c6a3a799375 (diff) | |
broke out llunit.h into llunittype.h and llunits.h for unit declarations
changed unit declarations macros to make a lot more sense
Diffstat (limited to 'indra/llcommon/tests/lltrace_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/lltrace_test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/tests/lltrace_test.cpp b/indra/llcommon/tests/lltrace_test.cpp index 1c2a4528ae..8ce509699d 100644 --- a/indra/llcommon/tests/lltrace_test.cpp +++ b/indra/llcommon/tests/lltrace_test.cpp @@ -36,12 +36,12 @@ namespace LLUnits { // using powers of 2 to allow strict floating point equality LL_DECLARE_BASE_UNIT(Ounces, "oz"); - LL_DECLARE_DERIVED_UNIT(Ounces, * 12, TallCup, ""); - LL_DECLARE_DERIVED_UNIT(Ounces, * 16, GrandeCup, ""); - LL_DECLARE_DERIVED_UNIT(Ounces, * 20, VentiCup, ""); + LL_DECLARE_DERIVED_UNIT(TallCup, "", Ounces, / 12); + LL_DECLARE_DERIVED_UNIT(GrandeCup, "", Ounces, / 16); + LL_DECLARE_DERIVED_UNIT(VentiCup, "", Ounces, / 20); LL_DECLARE_BASE_UNIT(Grams, "g"); - LL_DECLARE_DERIVED_UNIT(Grams, / 1000, Milligrams, "mg"); + LL_DECLARE_DERIVED_UNIT(Milligrams, "mg", Grams, * 1000); } LL_DECLARE_UNIT_TYPEDEFS(LLUnits, Ounces); |