diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-23 08:48:04 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-23 08:48:04 +0300 |
commit | 3e85830cb2c23780d53b7171a31db8a6d2ce8672 (patch) | |
tree | 4c2948a480d5ca6b30358128c50ef607dce51ce4 /extern/bullet2/src/BulletCollision | |
parent | c7c49fa9a3e923955dc7caf81b8b60d90f67b9dc (diff) |
work around some issue with GCC 3.x (probably compiler bug)
Diffstat (limited to 'extern/bullet2/src/BulletCollision')
-rw-r--r-- | extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp index df4563f7348..ade4635c57b 100644 --- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp +++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp @@ -218,8 +218,11 @@ struct GJK // vdh : very dumm hash static inline U Hash(const Vector3& v) { - const U h(U(v[0]*15461)^U(v[1]*83003)^U(v[2]*15473)); - return(((*((const U*)&h))*169639)&GJK_hashmask); + //this doesn't compile under GCC 3.3.5, so add the ()... + //const U h(U(v[0]*15461)^U(v[1]*83003)^U(v[2]*15473)); + //return(((*((const U*)&h))*169639)&GJK_hashmask); + const U h((U)(v[0]*15461)^(U)(v[1]*83003)^(U)(v[2]*15473)); + return(((*((const U*)&h))*169639)&GJK_hashmask); } // inline Vector3 LocalSupport(const Vector3& d,U i) const |