[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

loki at webkit.org loki at webkit.org
Wed Dec 22 12:33:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 0c7529f90ac8ba47d63f3414750ade860da15520
Author: loki at webkit.org <loki at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 08:23:58 2010 +0000

    Avoid increasing required alignment of target type warning
    https://bugs.webkit.org/show_bug.cgi?id=43963
    
    Reviewed by Gavin Barraclough.
    
    Fix platform independent alignment warnings.
    
    JavaScriptCore:
    
    * wtf/ListHashSet.h:
    (WTF::ListHashSetNodeAllocator::pool):
    
    WebCore:
    
    * loader/CachedMetadata.h:
    (WebCore::CachedMetadata::readUnsigned):
    * platform/text/TextCodecLatin1.cpp:
    (WebCore::TextCodecLatin1::decode):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f841c37..28fc29d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-16  Gabor Loki  <loki at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        Avoid increasing required alignment of target type warning
+        https://bugs.webkit.org/show_bug.cgi?id=43963
+
+        Fix platform independent alignment warnings.
+
+        * wtf/ListHashSet.h:
+        (WTF::ListHashSetNodeAllocator::pool):
+
 2010-08-19  Gabor Loki  <loki at webkit.org>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/wtf/ListHashSet.h b/JavaScriptCore/wtf/ListHashSet.h
index 09355ad..e14ac45 100644
--- a/JavaScriptCore/wtf/ListHashSet.h
+++ b/JavaScriptCore/wtf/ListHashSet.h
@@ -24,6 +24,7 @@
 #include "Assertions.h"
 #include "HashSet.h"
 #include "OwnPtr.h"
+#include "StdLibExtras.h"
 
 namespace WTF {
 
@@ -171,7 +172,7 @@ namespace WTF {
         }
 
     private:
-        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
+        Node* pool() { return reinterpret_cast_ptr<Node*>(m_pool.pool); }
         Node* pastPool() { return pool() + m_poolSize; }
 
         bool inPool(Node* node)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e01d03f..89562af 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-16  Gabor Loki  <loki at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        Avoid increasing required alignment of target type warning
+        https://bugs.webkit.org/show_bug.cgi?id=43963
+
+        Fix platform independent alignment warnings.
+
+        * loader/CachedMetadata.h:
+        (WebCore::CachedMetadata::readUnsigned):
+        * platform/text/TextCodecLatin1.cpp:
+        (WebCore::TextCodecLatin1::decode):
+
 2010-08-25  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/loader/CachedMetadata.h b/WebCore/loader/CachedMetadata.h
index d26539e..120e4c0 100644
--- a/WebCore/loader/CachedMetadata.h
+++ b/WebCore/loader/CachedMetadata.h
@@ -84,7 +84,7 @@ private:
     {
         if (m_serializedData.size() < position + sizeof(unsigned))
             return 0;
-        return *reinterpret_cast<unsigned*>(const_cast<char*>(m_serializedData.data() + position));
+        return *reinterpret_cast_ptr<unsigned*>(const_cast<char*>(m_serializedData.data() + position));
     }
 
     // Appends an unsigned value to the end of the serialized data.
diff --git a/WebCore/platform/text/TextCodecLatin1.cpp b/WebCore/platform/text/TextCodecLatin1.cpp
index 4f9cbe0..2a217c5 100644
--- a/WebCore/platform/text/TextCodecLatin1.cpp
+++ b/WebCore/platform/text/TextCodecLatin1.cpp
@@ -164,7 +164,7 @@ String TextCodecLatin1::decode(const char* bytes, size_t length, bool, bool, boo
             // Wait until we're at a properly aligned address, then read full CPU words.
             if (!(reinterpret_cast<ptrdiff_t>(src) & (sizeof(uintptr_t) - 1))) {
                 while (src < alignedEnd) {
-                    uintptr_t chunk = *reinterpret_cast<const uintptr_t*>(src);
+                    uintptr_t chunk = *reinterpret_cast_ptr<const uintptr_t*>(src);
 
                     if (chunk & NonASCIIMask<sizeof(uintptr_t)>::value())
                         goto useLookupTable;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list