Merge pull request #26069 from hpvb/align-variant

Align the Variant data member
godotengine · Feb 20, 2019 · 75c89aa · 75c89aa
2 parents 1f257d3 + b6b113c
commit 75c89aa
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/variant.h b/core/variant.h
@@ -69,6 +69,13 @@ typedef PoolVector<Vector2> PoolVector2Array;
 typedef PoolVector<Vector3> PoolVector3Array;
 typedef PoolVector<Color> PoolColorArray;
 
+// Temporary workaround until c++11 alignas()
+#ifdef __GNUC__
+#define GCC_ALIGNED_8 __attribute__((aligned(8)))
+#else
+#define GCC_ALIGNED_8
+#endif
+
 class Variant {
 public:
 	// If this changes the table in variant_op must be updated
@@ -132,7 +139,6 @@ class Variant {
 	_FORCE_INLINE_ const ObjData &_get_obj() const;
 
 	union {
-
 		bool _bool;
 		int64_t _int;
 		double _real;
@@ -142,7 +148,7 @@ class Variant {
 		Transform *_transform;
 		void *_ptr; //generic pointer
 		uint8_t _mem[sizeof(ObjData) > (sizeof(real_t) * 4) ? sizeof(ObjData) : (sizeof(real_t) * 4)];
-	} _data;
+	} _data GCC_ALIGNED_8;
 
 	void reference(const Variant &p_variant);
 	void clear();