[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

simon.fraser at apple.com simon.fraser at apple.com
Mon Feb 21 00:25:04 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 9131cbe13ed86f69059b196139a7aabe72b051c7
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 31 06:05:55 2011 +0000

    2011-01-30  Simon Fraser  <simon.fraser at apple.com>
    
            Build fix the build fix. I assume Oliver meant m_cell, not m_value.
    
            * runtime/WriteBarrier.h:
            (JSC::WriteBarrierBase::clear):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77111 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 098cdc9..e55f33c 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-30  Simon Fraser  <simon.fraser at apple.com>
+
+        Build fix the build fix. I assume Oliver meant m_cell, not m_value.
+
+        * runtime/WriteBarrier.h:
+        (JSC::WriteBarrierBase::clear):
+
 2011-01-30  Oliver Hunt  <oliver at apple.com>
 
         More Qt build fixes
diff --git a/Source/JavaScriptCore/runtime/WriteBarrier.h b/Source/JavaScriptCore/runtime/WriteBarrier.h
index 3b3c5a8..6309206 100644
--- a/Source/JavaScriptCore/runtime/WriteBarrier.h
+++ b/Source/JavaScriptCore/runtime/WriteBarrier.h
@@ -88,7 +88,7 @@ public:
     T* get() const { return reinterpret_cast<T*>(m_cell); }
     T* operator*() const { return static_cast<T*>(m_cell); }
     T* operator->() const { return static_cast<T*>(m_cell); }
-    void clear() { m_value = 0; }
+    void clear() { m_cell = 0; }
     
     JSCell** slot() { return &m_cell; }
     

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list