From 41af960e7a9f40ea77e6c5ac527d329a5a6b6f4a Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 6 Feb 2009 19:05:54 +0000 Subject: [PATCH] Applied some warning/assert patches, thanks to Ole K. http://code.google.com/p/bullet/issues/detail?id=186 --- src/BulletCollision/Gimpact/btGImpactBvh.cpp | 3 +-- src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp | 3 +-- src/BulletCollision/Gimpact/gim_box_set.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/BulletCollision/Gimpact/btGImpactBvh.cpp b/src/BulletCollision/Gimpact/btGImpactBvh.cpp index 3dce9f942..38fed6b4f 100644 --- a/src/BulletCollision/Gimpact/btGImpactBvh.cpp +++ b/src/BulletCollision/Gimpact/btGImpactBvh.cpp @@ -150,8 +150,7 @@ int btBvhTree::_sort_and_calc_splitting_index( splitIndex = startIndex+ (numIndices>>1); } - bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex)); - btAssert(!unbal); + btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex)))); return splitIndex; diff --git a/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp b/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp index 553f7ba13..ea1647a81 100644 --- a/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp +++ b/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp @@ -171,8 +171,7 @@ int btQuantizedBvhTree::_sort_and_calc_splitting_index( splitIndex = startIndex+ (numIndices>>1); } - bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex)); - btAssert(!unbal); + btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex)))); return splitIndex; diff --git a/src/BulletCollision/Gimpact/gim_box_set.cpp b/src/BulletCollision/Gimpact/gim_box_set.cpp index 79e77a5d9..0c3d7ba8d 100644 --- a/src/BulletCollision/Gimpact/gim_box_set.cpp +++ b/src/BulletCollision/Gimpact/gim_box_set.cpp @@ -110,7 +110,7 @@ GUINT GIM_BOX_TREE::_sort_and_calc_splitting_index( splitIndex = startIndex+ (numIndices>>1); } - btAssert(!(splitIndex==startIndex) || (splitIndex == (endIndex))); + btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex)))); return splitIndex; }