Changeset 2908 for code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/LinearMath/btAlignedAllocator.h (modified) (2 diffs)

code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.h

@@ -39 +39 @@
         void    btAlignedFreeInternal   (void* ptr);
 
-        #define btAlignedAlloc(size,alignment) btAlignedAllocInternal(size,alignment)
+        #define btAlignedAlloc(a,b) btAlignedAllocInternal(a,b)
         #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 btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc);
 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);
-
 
 ///The btAlignedAllocator is a portable class for aligned memory allocations.