Changeset 52918 in webkit

Timestamp:

Jan 7, 2010 4:13:53 AM (14 years ago)

Author:

zoltan@webkit.org

Message:

2010-01-07 Zoltan Horvath <​zoltan@webkit.org>

Reviewed by Holger Freyther.

[Mac] Build fix when FAST_MALLOC_MATCH_VALIDATION=1
​https://bugs.webkit.org/show_bug.cgi?id=33312

Using of operator += cause compile error on Mac, so it is changed to
"= static_cast<AllocAlignmentInteger*>(old_ptr) + 1".

• wtf/FastMalloc.cpp: (WTF::TCMallocStats::realloc):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-01-07  Zoltan Horvath  <zoltan@webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        [Mac] Build fix when FAST_MALLOC_MATCH_VALIDATION=1
+        https://bugs.webkit.org/show_bug.cgi?id=33312
+
+        Using of operator += cause compile error on Mac, so it is changed to
+        "= static_cast<AllocAlignmentInteger*>(old_ptr) + 1".
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMallocStats::realloc):
+
 2010-01-07  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -3796 +3796 @@
   } else {
 #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
-    old_ptr += sizeof(AllocAlignmentInteger); // Set old_ptr back to the user pointer.
+    old_ptr = static_cast<AllocAlignmentInteger*>(old_ptr) + 1; // Set old_ptr back to the user pointer.
 #endif
     return old_ptr;