From 356d10e6a6cfea279228f371aed88aba73ed70dd Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Mon, 11 Mar 2013 13:12:03 -0700
Subject: Work around 'interesting' forced include order in vmath stuff on
Windows
---
indra/llmath/llvolume.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llmath')
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 1ff53590cf..6b599a4126 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -41,7 +41,6 @@ class LLVolumeFace;
class LLVolume;
class LLVolumeTriangle;
-#include "llalignedarray.h"
#include "lldarray.h"
#include "lluuid.h"
#include "v4color.h"
@@ -58,6 +57,7 @@ class LLVolumeTriangle;
#include "llrefcount.h"
#include "llpointer.h"
#include "llfile.h"
+#include "llalignedarray.h"
//============================================================================
--
cgit v1.2.3
From 9a0f913e7089c9b2120856936bf47dcb8de9c6b1 Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Mon, 11 Mar 2013 13:55:40 -0700
Subject: Work around bogus gcc 4.3.4 warning from alignment assert
---
indra/llmath/llvector4a.h | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'indra/llmath')
diff --git a/indra/llmath/llvector4a.h b/indra/llmath/llvector4a.h
index 0526793d3a..1a478bc8de 100644
--- a/indra/llmath/llvector4a.h
+++ b/indra/llmath/llvector4a.h
@@ -93,7 +93,11 @@ public:
LLVector4a()
{ //DO NOT INITIALIZE -- The overhead is completely unnecessary
+// This assert is causing spurious referenced before set warnings on GCC 4.3.4
+//
+#if !LL_LINUX
ll_assert_aligned(this,16);
+#endif
}
LLVector4a(F32 x, F32 y, F32 z, F32 w = 0.f)
--
cgit v1.2.3