From 003b6fa6694ad073b049e04463ec93c055b305fe Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Mon, 27 Oct 2008 20:20:28 +0000 Subject: [PATCH] removed some warnings, as reported here: http://code.google.com/p/bullet/issues/detail?id=123 Thanks sparkprime --- Extras/ConvexDecomposition/ConvexBuilder.cpp | 2 +- Extras/ConvexDecomposition/ConvexDecomposition.cpp | 2 +- Extras/ConvexDecomposition/cd_hull.cpp | 2 +- Extras/ConvexDecomposition/cd_vector.h | 6 +++--- Extras/ConvexDecomposition/cd_wavefront.cpp | 2 +- Extras/ConvexDecomposition/cd_wavefront.h | 2 +- Extras/ConvexDecomposition/concavity.cpp | 2 +- Extras/ConvexDecomposition/concavity.h | 2 +- Extras/ConvexDecomposition/splitplane.cpp | 2 +- .../CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp | 2 +- .../CollisionShapes/btConvexInternalShape.cpp | 2 +- src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp | 2 +- .../SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp | 3 ++- .../SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h | 2 +- 14 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Extras/ConvexDecomposition/ConvexBuilder.cpp b/Extras/ConvexDecomposition/ConvexBuilder.cpp index baf80f42a..9d7fc81ca 100644 --- a/Extras/ConvexDecomposition/ConvexBuilder.cpp +++ b/Extras/ConvexDecomposition/ConvexBuilder.cpp @@ -55,7 +55,7 @@ bool CHull::overlap(const CHull &h) const ConvexBuilder::ConvexBuilder(ConvexDecompInterface *callback) { mCallback = callback; -}; +} ConvexBuilder::~ConvexBuilder(void) { diff --git a/Extras/ConvexDecomposition/ConvexDecomposition.cpp b/Extras/ConvexDecomposition/ConvexDecomposition.cpp index a797eed9a..e275adb05 100644 --- a/Extras/ConvexDecomposition/ConvexDecomposition.cpp +++ b/Extras/ConvexDecomposition/ConvexDecomposition.cpp @@ -374,4 +374,4 @@ void calcConvexDecomposition(unsigned int vcount, -}; +} diff --git a/Extras/ConvexDecomposition/cd_hull.cpp b/Extras/ConvexDecomposition/cd_hull.cpp index 206c07187..e2edbe355 100644 --- a/Extras/ConvexDecomposition/cd_hull.cpp +++ b/Extras/ConvexDecomposition/cd_hull.cpp @@ -3232,4 +3232,4 @@ void HullLibrary::BringOutYourDead(const float *verts,unsigned int vcount, float free(used); } -}; +} diff --git a/Extras/ConvexDecomposition/cd_vector.h b/Extras/ConvexDecomposition/cd_vector.h index a10ad0c29..52c1f085a 100644 --- a/Extras/ConvexDecomposition/cd_vector.h +++ b/Extras/ConvexDecomposition/cd_vector.h @@ -1172,14 +1172,14 @@ inline Vector3d operator * (float s, const Vector3d &v ) { Vector3d Scaled(v.x*s, v.y*s, v.z*s); return(Scaled); -}; +} inline Vector2d operator * (float s, const Vector2d &v ) { Vector2d Scaled(v.x*s, v.y*s); return(Scaled); - }; + } -}; +} #endif diff --git a/Extras/ConvexDecomposition/cd_wavefront.cpp b/Extras/ConvexDecomposition/cd_wavefront.cpp index b67077559..32c3e1164 100644 --- a/Extras/ConvexDecomposition/cd_wavefront.cpp +++ b/Extras/ConvexDecomposition/cd_wavefront.cpp @@ -857,4 +857,4 @@ unsigned int WavefrontObj::loadObj(const char *fname) // load a wavefront obj re return ret; } -}; +} diff --git a/Extras/ConvexDecomposition/cd_wavefront.h b/Extras/ConvexDecomposition/cd_wavefront.h index 2197d8f2e..4c2980bb2 100644 --- a/Extras/ConvexDecomposition/cd_wavefront.h +++ b/Extras/ConvexDecomposition/cd_wavefront.h @@ -57,6 +57,6 @@ public: float *mVertices; }; -}; +} #endif diff --git a/Extras/ConvexDecomposition/concavity.cpp b/Extras/ConvexDecomposition/concavity.cpp index 18973b995..fc2489cab 100644 --- a/Extras/ConvexDecomposition/concavity.cpp +++ b/Extras/ConvexDecomposition/concavity.cpp @@ -792,4 +792,4 @@ float computeConcavity(unsigned int vcount, } -}; +} diff --git a/Extras/ConvexDecomposition/concavity.h b/Extras/ConvexDecomposition/concavity.h index 2004052b3..858b92d92 100644 --- a/Extras/ConvexDecomposition/concavity.h +++ b/Extras/ConvexDecomposition/concavity.h @@ -54,7 +54,7 @@ float computeConcavity(unsigned int vcount, float &volume); -}; +} #endif diff --git a/Extras/ConvexDecomposition/splitplane.cpp b/Extras/ConvexDecomposition/splitplane.cpp index 584ec3124..c552d3cbd 100644 --- a/Extras/ConvexDecomposition/splitplane.cpp +++ b/Extras/ConvexDecomposition/splitplane.cpp @@ -303,4 +303,4 @@ bool computeSplitPlane(unsigned int vcount, } -}; +} diff --git a/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp index 6d28904cb..955802e2c 100644 --- a/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp @@ -72,7 +72,7 @@ btConvexTriangleCallback::~btConvexTriangleCallback() void btConvexTriangleCallback::clearCache() { m_dispatcher->clearManifold(m_manifoldPtr); -}; +} diff --git a/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp b/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp index bd805ab18..e4e564e64 100644 --- a/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp @@ -48,7 +48,7 @@ void btConvexInternalShape::getAabbSlow(const btTransform& trans,btVector3&minAa tmp = trans(localGetSupportingVertex(vec*trans.getBasis())); minAabb[i] = tmp[i]-margin; } -}; +} btVector3 btConvexInternalShape::localGetSupportingVertex(const btVector3& vec)const diff --git a/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp index 4d7cd05fe..4575c96d2 100644 --- a/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp @@ -425,5 +425,5 @@ btScalar resolveSingleFrictionEmpty( return btScalar(0.); -}; +} diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp index fbf4f77f7..b06757692 100644 --- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp +++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp @@ -500,7 +500,8 @@ struct eStatus { enum _ { OutOfVertices, AccuraryReached, FallBack, - Failed, };}; + Failed +};}; /* Fields */ eStatus::_ m_status; GJK::sSimplex m_result; diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h index 255c374cf..1cd992b07 100644 --- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h +++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h @@ -12,7 +12,7 @@ struct sResults Separated, /* Shapes doesnt penetrate */ Penetrating, /* Shapes are penetrating */ GJK_Failed, /* GJK phase fail, no big issue, shapes are probably just 'touching' */ - EPA_Failed, /* EPA phase fail, bigger problem, need to save parameters, and debug */ + EPA_Failed /* EPA phase fail, bigger problem, need to save parameters, and debug */ } status; btVector3 witnesses[2]; btVector3 normal;