From 37f208b1413628e0e105f0b069379a22f00e6482 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 26 Feb 2020 10:47:05 -0500
Subject: [PATCH] Work around an annoying xcode bug
---
indra/llmath/llmatrix4a.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llmath/llmatrix4a.h b/indra/llmath/llmatrix4a.h
index 67788c065d..78223b040f 100644
--- a/indra/llmath/llmatrix4a.h
+++ b/indra/llmath/llmatrix4a.h
@@ -31,10 +31,10 @@
#include "m4math.h"
#include "m3math.h"
-class alignas(64) LLMatrix4a
+LL_ALIGN_PREFIX(64) class LLMatrix4a
{
private:
- alignas(64) LLVector4a mMatrix[4];
+ LL_ALIGN_PREFIX(64) LLVector4a mMatrix[4] LL_ALIGN_POSTFIX(64);
public:
enum
{
@@ -791,7 +791,7 @@ public:
return _mm_movemask_epi8(_mm_castps_si128(_mm_and_ps(mask1, mask2))) == 0xFFFF;
}
-};
+} LL_ALIGN_POSTFIX(64);
static_assert(std::is_trivial<LLMatrix4a>{}, "LLMatrix4a must be a trivial type");
static_assert(std::is_standard_layout<LLMatrix4a>{}, "LLMatrix4a must be a standard layout type");
--
GitLab