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

use <memory> for replacement new

Browse Source
This commit is contained in:
ejcoumans
2007-06-16 00:24:28 +00:00
parent 65d10d7b12
commit ca1c42f07f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/LinearMath/btAlignedObjectArray.h
View File

@@ -24,12 +24,18 @@ subject to the following restrictions:
///then the btAlignedObjectArray doesn't support objects with virtual methods, and non-trivial constructors/destructors ///then the btAlignedObjectArray doesn't support objects with virtual methods, and non-trivial constructors/destructors
///see discussion here: http://continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1231 ///see discussion here: http://continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1231
#define USE_NEW_INPLACE_NEW 1 #define USE_NEW_INPLACE_NEW 1
#ifdef USE_NEW_INPLACE_NEW #ifdef USE_NEW_INPLACE_NEW
#include <new.h> //in-place new #include <memory> //for replacement new
#include <string.h> //memcpy
#ifndef WIN32
#include <string.h>//for memcpy
#endif
#endif //USE_NEW_INPLACE_NEW #endif //USE_NEW_INPLACE_NEW
///btAlignedObjectArray uses a subset of the stl::vector interface for its methods ///btAlignedObjectArray uses a subset of the stl::vector interface for its methods
///It is developed to replace stl::vector to avoid STL alignment issues to add SIMD/SSE data ///It is developed to replace stl::vector to avoid STL alignment issues to add SIMD/SSE data
template <typename T> template <typename T>
@@ -168,7 +174,7 @@ class btAlignedObjectArray
} }
SIMD_FORCE_INLINE T& expand( T& fillValue=T()) SIMD_FORCE_INLINE T& expand( const T& fillValue=T())
{ {
int sz = size(); int sz = size();
if( sz == capacity() ) if( sz == capacity() )