From: loki@webkit.org <loki@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 8 Sep 2010 22:43:25 +0000 (+0000)
Subject: 2010-09-08  Gabor Loki  <loki@webkit.org>
X-Git-Url: https://git.webkit.org/?p=WebKit.git;a=commitdiff_plain;h=616283abe03ab020e688d09b95708ca5928075d3;hp=828c1048ec5305693b5d2115e85551a2d06dd449;ds=sidebyside

2010-09-08  Gabor Loki  <loki@webkit.org>

        Reviewed by Andreas Kling.

        Fix increases required alignment of target type warning on ARM
        https://bugs.webkit.org/show_bug.cgi?id=45301

        No new tests needed.

        * bindings/js/SerializedScriptValue.cpp:
        (WebCore::CloneDeserializer::readLittleEndian):
        (WebCore::CloneDeserializer::readString):
        * plugins/PluginDatabase.cpp:
        (WebCore::readTime):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67028 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d120862daeef..29f2c14e3ff9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-08  Gabor Loki  <loki@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Fix increases required alignment of target type warning on ARM
+        https://bugs.webkit.org/show_bug.cgi?id=45301
+
+        No new tests needed.
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::CloneDeserializer::readLittleEndian):
+        (WebCore::CloneDeserializer::readString):
+        * plugins/PluginDatabase.cpp:
+        (WebCore::readTime):
+
 2010-09-08  Antonio Gomes  <agomes@rim.com>
 
         Reviewed by Daniel Bates.
diff --git a/WebCore/bindings/js/SerializedScriptValue.cpp b/WebCore/bindings/js/SerializedScriptValue.cpp
index f2290888565d..fcd331469f2d 100644
--- a/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -800,7 +800,7 @@ private:
         if (sizeof(T) == 1)
             value = *ptr++;
         else {
-            value = *reinterpret_cast<const T*>(ptr);
+            value = *reinterpret_cast_ptr<const T*>(ptr);
             ptr += sizeof(T);
         }
         return true;
@@ -888,7 +888,7 @@ private:
             return false;
 
 #if ASSUME_LITTLE_ENDIAN
-        str = UString(reinterpret_cast<const UChar*>(ptr), length);
+        str = UString(reinterpret_cast_ptr<const UChar*>(ptr), length);
         ptr += length * sizeof(UChar);
 #else
         Vector<UChar> buffer;
diff --git a/WebCore/plugins/PluginDatabase.cpp b/WebCore/plugins/PluginDatabase.cpp
index 46c7df70b0d6..d3e922a99c8f 100644
--- a/WebCore/plugins/PluginDatabase.cpp
+++ b/WebCore/plugins/PluginDatabase.cpp
@@ -507,7 +507,7 @@ static bool readTime(time_t& resultTime, char*& start, const char* end)
     if (start + sizeof(time_t) >= end)
         return false;
 
-    resultTime = *reinterpret_cast<time_t*>(start);
+    resultTime = *reinterpret_cast_ptr<time_t*>(start);
     start += sizeof(time_t);
 
     return true;