From 7867db46542953b4adee4834b4bcc9f19353a4e6 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 13 Jun 2014 14:23:51 +0200 Subject: [PATCH] SSE2: Non-SSE2 copy to avoid some issues with STL pairs --HG-- branch : sse2 --- code/nel/include/nel/misc/vector.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/include/nel/misc/vector.h b/code/nel/include/nel/misc/vector.h index 1d4ef3fe4..0d3216a18 100644 --- a/code/nel/include/nel/misc/vector.h +++ b/code/nel/include/nel/misc/vector.h @@ -73,10 +73,10 @@ public: // Methods. /// Constructor . CVector(float _x, float _y, float _z) : x(_x), y(_y), z(_z) { /*if (((uintptr_t)(void *)(this) & 0xF) != 0) nlerror("Vector alignment error");*/ } /// Copy Constructor. -#ifdef USE_SSE2 +#if 0 CVector(const CVector &v) : mm(v.mm) { /*if (((uintptr_t)(void *)(this) & 0xF) != 0) nlerror("Vector alignment error");*/ } #else - CVector(const CVector &v) : x(v.x), y(v.y), z(v.z) { } + CVector(const CVector &v) : x(v.x), y(v.y), z(v.z) { if (((uintptr_t)(void *)(this) & 0xF) != 0) nlerror("Vector alignment error"); } #endif //@}