diff options
author | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2020-05-03 00:42:04 +0200 |
---|---|---|
committer | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2020-05-03 00:42:04 +0200 |
commit | 596d42615155c945234e27b65a91c7654891453b (patch) | |
tree | 83647d637228f20df921e1d3d5f3791350492794 /core/variant.h | |
parent | d2887ea78b5256faaaae7e0ba66fc9146d35dceb (diff) |
Remove some C++11 polyfill defines that are no longer needed
Diffstat (limited to 'core/variant.h')
-rw-r--r-- | core/variant.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/variant.h b/core/variant.h index a832f7ccf8..1ae09ad82f 100644 --- a/core/variant.h +++ b/core/variant.h @@ -67,13 +67,6 @@ typedef Vector<Vector2> PackedVector2Array; typedef Vector<Vector3> PackedVector3Array; typedef Vector<Color> PackedColorArray; -// 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 @@ -211,7 +204,7 @@ private: PackedArrayRefBase *packed_array; void *_ptr; //generic pointer uint8_t _mem[sizeof(ObjData) > (sizeof(real_t) * 4) ? sizeof(ObjData) : (sizeof(real_t) * 4)]; - } _data GCC_ALIGNED_8; + } _data alignas(8); void reference(const Variant &p_variant); void clear(); |