Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make visual studio 6 compile again

Browse Source
This commit is contained in:
ejcoumans
2007-03-20 05:06:01 +00:00
parent c82f36fa34
commit f199cd1347
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
View File

@@ -292,7 +292,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
//traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated //traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated
for (int startIslandIndex=0;startIslandIndex<numElem;startIslandIndex = endIslandIndex) for ( startIslandIndex=0;startIslandIndex<numElem;startIslandIndex = endIslandIndex)
{ {
int islandId = getUnionFind().getElement(startIslandIndex).m_id; int islandId = getUnionFind().getElement(startIslandIndex).m_id;

2
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -723,7 +723,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
} }
} }
for (int i=0;i<tmpSolverBodyPool.size();i++) for ( i=0;i<tmpSolverBodyPool.size();i++)
{ {
tmpSolverBodyPool[i].writebackVelocity(); tmpSolverBodyPool[i].writebackVelocity();
} }

2
src/LinearMath/btAlignedAllocator.cpp
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#include "btAlignedAllocator.h" #include "btAlignedAllocator.h"
#if defined (WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) #if defined (BT_HAS_ALIGNED_ALOCATOR)
#include <malloc.h> #include <malloc.h>
void* btAlignedAlloc (int size, int alignment) void* btAlignedAlloc (int size, int alignment)

6
src/LinearMath/btAlignedAllocator.h
View File

@@ -36,11 +36,13 @@ class btAlignedAllocator {
typedef btAlignedAllocator< T , Alignment > self_type; typedef btAlignedAllocator< T , Alignment > self_type;
public: public:
//just going down a list: //just going down a list:
btAlignedAllocator() {} btAlignedAllocator() {}
/*
btAlignedAllocator( const self_type & ) {} btAlignedAllocator( const self_type & ) {}
*/
template < typename Other > template < typename Other >
btAlignedAllocator( const btAlignedAllocator< Other , Alignment > & ) {} btAlignedAllocator( const btAlignedAllocator< Other , Alignment > & ) {}

3
src/LinearMath/btScalar.h
View File

@@ -25,10 +25,11 @@ subject to the following restrictions:
#ifdef WIN32 #ifdef WIN32
#if defined(__MINGW32__) || defined(__CYGWIN__) #if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300)
#define SIMD_FORCE_INLINE inline #define SIMD_FORCE_INLINE inline
#define ATTRIBUTE_ALIGNED16(a) a #define ATTRIBUTE_ALIGNED16(a) a
#else #else
#define BT_HAS_ALIGNED_ALOCATOR
#pragma warning(disable:4530) #pragma warning(disable:4530)
#pragma warning(disable:4996) #pragma warning(disable:4996)
#pragma warning(disable:4786) #pragma warning(disable:4786)