livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUILDFIX: build fixes for mac

master
Richard Linden 2013-06-05 19:57:07 -07:00
parent 702bd5107a
commit 60b625588f
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llpointer.h
View File

@ -193,7 +193,7 @@ public:
{
if (pointer_t::notNull() && pointer_t::mPointer->getNumRefs() > 1)
{
*(pointer_t*)(this) = new Type(*pointer_t::mPointer);
*(pointer_t* )(this) = new Type(*pointer_t::mPointer);
}
}

4
indra/llcommon/lltrace.h
View File

@ -657,7 +657,7 @@ class EventStatHandle
: public TraceType<EventAccumulator>
{
public:
typedef typename F64 storage_t;
typedef F64 storage_t;
typedef TraceType<EventAccumulator> trace_t;
EventStatHandle(const char* name, const char* description = NULL)
@ -702,7 +702,7 @@ class CountStatHandle
: public TraceType<CountAccumulator>
{
public:
typedef typename F64 storage_t;
typedef F64 storage_t;
typedef TraceType<CountAccumulator> trace_t;
CountStatHandle(const char* name, const char* description = NULL)

3
indra/llcommon/llunit.h
View File

@ -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

6
indra/llcommon/tests/llunits_test.cpp
View File

@ -33,9 +33,9 @@
namespace LLUnits
{
// using powers of 2 to allow strict floating point equality
struct Quatloos { typedef Quatloos base_unit_t; };
LL_DECLARE_DERIVED_UNIT(4, Quatloos, Latinum);
LL_DECLARE_DERIVED_UNIT((1.0 / 4.0), Quatloos, Solari);
LL_DECLARE_BASE_UNIT(Quatloos, "Quat");
LL_DECLARE_DERIVED_UNIT(4, Quatloos, Latinum, "Lat");
LL_DECLARE_DERIVED_UNIT((1.0 / 4.0), Quatloos, Solari, "Sol");
}
namespace tut