Changeset 2882 for code/trunk/src/bullet/LinearMath/btAlignedAllocator.h

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/LinearMath/btAlignedAllocator.h (modified) (2 diffs)

code/trunk/src/bullet/LinearMath/btAlignedAllocator.h

@@ -39 +39 @@
         void    btAlignedFreeInternal   (void* ptr);
 
-        #define btAlignedAlloc(a,b) btAlignedAllocInternal(a,b)
+        #define btAlignedAlloc(size,alignment) btAlignedAllocInternal(size,alignment)
         #define btAlignedFree(ptr) btAlignedFreeInternal(ptr)
 
@@ -50 +50 @@
 typedef void (btFreeFunc)(void *memblock);
 
+///The developer can let all Bullet memory allocations go through a custom memory allocator, using btAlignedAllocSetCustom
+void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc);
+///If the developer has already an custom aligned allocator, then btAlignedAllocSetCustomAligned can be used. The default aligned allocator pre-allocates extra memory using the non-aligned allocator, and instruments it.
 void btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc);
-void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc);
+
 
 ///The btAlignedAllocator is a portable class for aligned memory allocations.