diff options
| author | erwin.coumans <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2013-10-22 23:08:43 +0000 |
|---|---|---|
| committer | erwin.coumans <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2013-10-22 23:08:43 +0000 |
| commit | 1503c806bd9c2db6873bc3c5acec9997fd233d72 (patch) | |
| tree | e334d7b60768b828b1413d83e558b5c4f4419d26 /src/LinearMath/btVector3.cpp | |
| parent | 9b447625193ef878423d993f951b6400b3f14236 (diff) | |
| download | bullet3-1503c806bd9c2db6873bc3c5acec9997fd233d72.tar.gz | |
fix Mac OSX build when using GNU++11 C++ language standard, make this the default in premake under OSX for easier testing
Diffstat (limited to 'src/LinearMath/btVector3.cpp')
| -rw-r--r-- | src/LinearMath/btVector3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/LinearMath/btVector3.cpp b/src/LinearMath/btVector3.cpp index eadcedce7..9389a25ca 100644 --- a/src/LinearMath/btVector3.cpp +++ b/src/LinearMath/btVector3.cpp @@ -51,7 +51,7 @@ long _maxdot_large( const float *vv, const float *vec, unsigned long count, floa long _maxdot_large( const float *vv, const float *vec, unsigned long count, float *dotResult ) { const float4 *vertices = (const float4*) vv; - static const unsigned char indexTable[16] = {-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 }; + static const unsigned char indexTable[16] = {(unsigned char)-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 }; float4 dotMax = btAssign128( -BT_INFINITY, -BT_INFINITY, -BT_INFINITY, -BT_INFINITY ); float4 vvec = _mm_loadu_ps( vec ); float4 vHi = btCastiTo128f(_mm_shuffle_epi32( btCastfTo128i( vvec), 0xaa )); /// zzzz @@ -436,7 +436,7 @@ long _mindot_large( const float *vv, const float *vec, unsigned long count, floa long _mindot_large( const float *vv, const float *vec, unsigned long count, float *dotResult ) { const float4 *vertices = (const float4*) vv; - static const unsigned char indexTable[16] = {-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 }; + static const unsigned char indexTable[16] = {(unsigned char)-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 }; float4 dotmin = btAssign128( BT_INFINITY, BT_INFINITY, BT_INFINITY, BT_INFINITY ); float4 vvec = _mm_loadu_ps( vec ); float4 vHi = btCastiTo128f(_mm_shuffle_epi32( btCastfTo128i( vvec), 0xaa )); /// zzzz |