make visual studio 6 compile again

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

View File

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

View File

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

View File

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