Merge branch 'master' into ModularizeBPTC

This commit is contained in:
Pavel Krajcevski 2014-03-23 17:41:46 -04:00
commit 5725220ba6
2 changed files with 3 additions and 1 deletions

View file

@ -64,7 +64,7 @@ TEST(VectorBase, Constructors) {
for(int i = 0; i < 7; i++)
v7i[i] = -i;
FasTC::VectorBase<unsigned, 16> 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) \

View file

@ -140,6 +140,8 @@ void TCThread::Yield() {
uint64 TCThread::ThreadID() {
#ifdef __MINGW32__
return static_cast<uint64>(pthread_self().x);
#elif defined __APPLE__
return reinterpret_cast<uint64>(pthread_self());
#else
return static_cast<uint64>(pthread_self());
#endif