Fixed warnings in Bullet/src core library

Thanks Martijn Reuvers from Two Tribes B.V. (www.twotribes.com) for the patch

To make this work more visible, suppress warnings in external libraries in Extras (COLLADA_DOM, libxml and glui contain many warnings)
Added PreprocessorDefinitions: _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE to vcproj files

1 files changed, 10 insertions, 11 deletions

diff --git a/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
index dec6aee1c..46726ce26 100644
--- a/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
+++ b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
@@ -205,7 +205,7 @@ private:
 	

 	SIMD_FORCE_INLINE	unsigned int getHash(unsigned int proxyId1, unsigned int proxyId2)

 	{

-		int key = ((unsigned int)proxyId1) | (((unsigned int)proxyId2) <<16);

+		int key = static_cast<int>(((unsigned int)proxyId1) | (((unsigned int)proxyId2) <<16));

 		// Thomas Wang's hash

 

 		key += ~(key << 15);

@@ -214,7 +214,7 @@ private:
 		key ^=  (key >> 6);

 		key += ~(key << 11);

 		key ^=  (key >> 16);

-		return key;

+		return static_cast<unsigned int>(key);

 	}

 	

 

@@ -380,7 +380,7 @@ public:
 		return m_overlappingPairArray;

 	}

 	

-	virtual	void	cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher)

+	virtual	void	cleanOverlappingPair(btBroadphasePair& /*pair*/,btDispatcher* /*dispatcher*/)

 	{

 

 	}

@@ -390,20 +390,20 @@ public:
 		return 0;

 	}

 

-	virtual void	cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher)

+	virtual void	cleanProxyFromPairs(btBroadphaseProxy* /*proxy*/,btDispatcher* /*dispatcher*/)

 	{

 

 	}

 

-	virtual	void setOverlapFilterCallback(btOverlapFilterCallback* callback)

+	virtual	void setOverlapFilterCallback(btOverlapFilterCallback* /*callback*/)

 	{

 	}

 

-	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* dispatcher)

+	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* /*dispatcher*/)

 	{

 	}

 

-	virtual btBroadphasePair* findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)

+	virtual btBroadphasePair* findPair(btBroadphaseProxy* /*proxy0*/, btBroadphaseProxy* /*proxy1*/)

 	{

 		return 0;

 	}

@@ -413,17 +413,17 @@ public:
 		return true;

 	}

 

-	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)

+	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* /*proxy0*/,btBroadphaseProxy* /*proxy1*/)

 	{

 		return 0;

 	}

 

-	virtual void*	removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1,btDispatcher* dispatcher)

+	virtual void*	removeOverlappingPair(btBroadphaseProxy* /*proxy0*/,btBroadphaseProxy* /*proxy1*/,btDispatcher* /*dispatcher*/)

 	{

 		return 0;

 	}

 

-	virtual void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy0,btDispatcher* dispatcher)

+	virtual void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* /*proxy0*/,btDispatcher* /*dispatcher*/)

 	{

 	}

 

@@ -434,4 +434,3 @@ public:
 #endif //OVERLAPPING_PAIR_CACHE_H

 

 

-