summaryrefslogtreecommitdiff
path: root/indra/llmath/m4math.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-03-02 21:25:50 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-03-02 21:25:50 +0000
commit4dabd9c0472deb49573fdafef2fa413e59703f19 (patch)
tree06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/llmath/m4math.h
parentd4462963c6ba5db2088723bbedc7b60f1184c594 (diff)
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/llmath/m4math.h')
-rw-r--r--indra/llmath/m4math.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h
index 4f26d875ff..69463d7718 100644
--- a/indra/llmath/m4math.h
+++ b/indra/llmath/m4math.h
@@ -73,9 +73,6 @@ class LLQuaternion;
static const U32 NUM_VALUES_IN_MAT4 = 4;
-#if LL_WINDOWS
-__declspec(align(16))
-#endif
class LLMatrix4
{
public:
@@ -218,11 +215,7 @@ public:
friend const LLMatrix4& operator*=(LLMatrix4 &a, const F32 &b); // Return a * b
friend std::ostream& operator<<(std::ostream& s, const LLMatrix4 &a); // Stream a
-}
-#if LL_DARWIN
-__attribute__ ((aligned (16)))
-#endif
-;
+};
inline LLMatrix4::LLMatrix4()