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

Merge pull request #503 from ajshort/patch-1

Browse Source 
Remove usage of deprecated `register` keyword
This commit is contained in:
erwincoumans
2015-10-27 11:03:24 -07:00
parent 3f1940987c 98bce6e484
commit bd55f6b058
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/LinearMath/btAlignedObjectArray.h
View File

@@ -39,6 +39,12 @@ subject to the following restrictions:
#include <new> //for placement new
#endif //BT_USE_PLACEMENT_NEW
// The register keyword is deprecated in C++11 so don't use it.
#if __cplusplus > 199711L
#define BT_REGISTER
#else
#define BT_REGISTER register
#endif
///The btAlignedObjectArray template class uses a subset of the stl::vector interface for its methods
///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data
@@ -211,7 +217,7 @@ protected:
SIMD_FORCE_INLINE void resize(int newsize, const T& fillData=T())
{
const register int curSize = size();
const BT_REGISTER int curSize = size();
if (newsize < curSize)
{
@@ -238,7 +244,7 @@ protected:
}
SIMD_FORCE_INLINE T& expandNonInitializing( )
{
const register int sz = size();
const BT_REGISTER int sz = size();
if( sz == capacity() )
{
reserve( allocSize(size()) );
@@ -251,7 +257,7 @@ protected:
SIMD_FORCE_INLINE T& expand( const T& fillValue=T())
{
const register int sz = size();
const BT_REGISTER int sz = size();
if( sz == capacity() )
{
reserve( allocSize(size()) );
@@ -267,7 +273,7 @@ protected:
SIMD_FORCE_INLINE void push_back(const T& _Val)
{
const register int sz = size();
const BT_REGISTER int sz = size();
if( sz == capacity() )
{
reserve( allocSize(size()) );