Changeset 11115 for code/trunk/src/external/bullet

Timestamp:

Feb 14, 2016, 6:08:13 PM (9 years ago)

Author:

landauf

Message:

fixed code to compile in 64bit mode

Location:

code/trunk/src/external/bullet/LinearMath

Files:

• btAlignedAllocator.cpp (modified) (1 diff)
• btSerializer.h (modified) (2 diffs)

code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp

@@ -67 +67 @@
   real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1));
   if (real) {
-    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
+    offset = (alignment - (unsigned long long)(real + sizeof(void *))) & (alignment-1);
     ret = (void *)((real + sizeof(void *)) + offset);
     *((void **)(ret)-1) = (void *)(real);

code/trunk/src/external/bullet/LinearMath/btSerializer.h

@@ -248 +248 @@
                         }
                         {
-                                nr= (long)cp;
+                                nr= (long long)cp;
                         //      long mask=3;
                                 nr= ((nr+3)&~3)-nr;
@@ -283 +283 @@
 
                 {
-                                nr= (long)cp;
+                                nr= (long long)cp;
                         //      long mask=3;
                                 nr= ((nr+3)&~3)-nr;