From b1ef548a7cdcd9543b8b459d4b4043e3c6c95826 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Thu, 13 Mar 2014 21:45:03 -0400 Subject: [PATCH 1/2] Fix test iteration constant --- Base/test/TestVector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Base/test/TestVector.cpp b/Base/test/TestVector.cpp index b3d2176..3f479f4 100644 --- a/Base/test/TestVector.cpp +++ b/Base/test/TestVector.cpp @@ -64,7 +64,7 @@ TEST(VectorBase, Constructors) { for(int i = 0; i < 7; i++) v7i[i] = -i; FasTC::VectorBase v16u; - for(int i = 0; i < 7; i++) + for(int i = 0; i < 16; i++) v16u[i] = i; #define TEST_VECTOR_COPY_CONS(v, t, n) \ From 914eeae2847d2f05b2216cdce3b2091b7cc0269e Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Thu, 13 Mar 2014 21:45:14 -0400 Subject: [PATCH 2/2] PThreads are weird on OS X --- Core/src/ThreadPThread.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Core/src/ThreadPThread.cpp b/Core/src/ThreadPThread.cpp index e55da1c..de7b871 100644 --- a/Core/src/ThreadPThread.cpp +++ b/Core/src/ThreadPThread.cpp @@ -140,6 +140,8 @@ void TCThread::Yield() { uint64 TCThread::ThreadID() { #ifdef __MINGW32__ return static_cast(pthread_self().x); +#elif defined __APPLE__ + return reinterpret_cast(pthread_self()); #else return static_cast(pthread_self()); #endif