diff options
| author | Richard Linden <none@none> | 2013-06-05 19:57:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-05 19:57:07 -0700 |
| commit | 60b625588faec2472597dae50331b2ce95ce40a2 (patch) | |
| tree | bd615ca217d9cb375d1ac84e39a672b62c91f73a /indra/llcommon/llunit.h | |
| parent | 702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (diff) | |
BUILDFIX: build fixes for mac
Diffstat (limited to 'indra/llcommon/llunit.h')
| -rw-r--r-- | indra/llcommon/llunit.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index a5406fb3f0..f48cbe0e11 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -41,6 +41,7 @@ struct ConversionFactor { // spurious use of dependent type to stop gcc from triggering the static assertion before instantiating the template llstatic_assert_template(DERIVED_UNITS_TAG, false, "Cannot convert between types."); + return 0; } }; @@ -473,7 +474,7 @@ LL_DECLARE_DERIVED_UNIT(1000 * 1000, Hertz, Megahertz, "MHz"); LL_DECLARE_DERIVED_UNIT(1000 * 1000 * 1000, Hertz, Gigahertz, "GHz"); LL_DECLARE_BASE_UNIT(Radians, "rad"); -LL_DECLARE_DERIVED_UNIT(DEG_TO_RAD, Radians, Degrees, "deg"); +LL_DECLARE_DERIVED_UNIT(0.01745329251994, Radians, Degrees, "deg"); } // namespace LLUnits |