Changeset 179927 in webkit

Timestamp:

Feb 11, 2015, 8:12:13 AM (12 years ago)

Author:

Csaba Osztrogonác

Message:

bmalloc buildfix on 32 bit Linux (x86/ARM)
​https://bugs.webkit.org/show_bug.cgi?id=141472

Reviewed by Gyuyoung Kim.

• bmalloc/Algorithm.h:

(bmalloc::roundUpToMultipleOf):

• bmalloc/FixedVector.h:

(bmalloc::FixedVector::clear):

• bmalloc/Sizes.h:

(bmalloc::Sizes::sizeClass):

Location:

trunk/Source/bmalloc

Files:

• ChangeLog (modified) (1 diff)
• bmalloc/Algorithm.h (modified) (1 diff)
• bmalloc/FixedVector.h (modified) (1 diff)
• bmalloc/Sizes.h (modified) (1 diff)

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2015-02-11  Csaba Osztrogonác  <ossy@webkit.org>
+
+        bmalloc buildfix on 32 bit Linux (x86/ARM)
+        https://bugs.webkit.org/show_bug.cgi?id=141472
+
+        Reviewed by Gyuyoung Kim.
+
+        * bmalloc/Algorithm.h:
+        (bmalloc::roundUpToMultipleOf):
+        * bmalloc/FixedVector.h:
+        (bmalloc::FixedVector::clear):
+        * bmalloc/Sizes.h:
+        (bmalloc::Sizes::sizeClass):
+
 2015-02-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/bmalloc/bmalloc/Algorithm.h

@@ -71 +71 @@
 {
     BASSERT(isPowerOfTwo(divisor));
-    return reinterpret_cast<T>((reinterpret_cast<uintptr_t>(x) + (divisor - 1ul)) & ~(divisor - 1ul));
+    return reinterpret_cast<T>((reinterpret_cast<uintptr_t>(x) + (divisor - 1)) & ~(divisor - 1));
 }
 

trunk/Source/bmalloc/bmalloc/FixedVector.h

@@ -60 +60 @@
     void shrink(size_t);
 
-    void clear() { shrink(0ul); }
+    void clear() { shrink(static_cast<size_t>(0)); }
     bool isEmpty() { return !m_size; }
 

trunk/Source/bmalloc/bmalloc/Sizes.h

@@ -101 +101 @@
     {
         static const size_t sizeClassMask = (mediumMax / alignment) - 1;
-        return mask((size - 1ul) / alignment, sizeClassMask);
+        return mask((size - 1) / alignment, sizeClassMask);
     }