Changeset 148900 in webkit

Timestamp:

Apr 22, 2013 12:13:30 PM (11 years ago)

Author:

ddkilzer@apple.com

Message:

StringImpl.h should compile with -Wshorten-64-to-32
<​http://webkit.org/b/114970>

Reviewed by Darin Adler.

Fixes the following warnings with -Wshorten-64-to-32:

StringImpl.h:317:25: error: implicit conversion loses integer precision: 'uintptr_t' (aka 'unsigned long') to 'unsigned int' [-Werror,-Wshorten-64-to-32]

unsigned hash = reinterpret_cast<uintptr_t>(this);

• wtf/text/StringImpl.h:

(WTF::StringImpl::StringImpl): Add static_cast<uint32_t>() to
formalize taking the lower 32-bits of the pointer value on
64-bit architectures.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/text/StringImpl.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-04-22  David Kilzer  <ddkilzer@apple.com>
+
+        StringImpl.h should compile with -Wshorten-64-to-32
+        <http://webkit.org/b/114970>
+
+        Reviewed by Darin Adler.
+
+        Fixes the following warnings with -Wshorten-64-to-32:
+
+            StringImpl.h:317:25: error: implicit conversion loses integer precision: 'uintptr_t' (aka 'unsigned long') to 'unsigned int' [-Werror,-Wshorten-64-to-32]
+                    unsigned hash = reinterpret_cast<uintptr_t>(this);
+                             ~~~~   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        * wtf/text/StringImpl.h:
+        (WTF::StringImpl::StringImpl): Add static_cast<uint32_t>() to
+        formalize taking the lower 32-bits of the pointer value on
+        64-bit architectures.
+
 2013-04-22  Andreas Kling  <akling@apple.com>
 

trunk/Source/WTF/wtf/text/StringImpl.h

@@ -314 +314 @@
         // that's exactly the oposite of what we want!), and teh normal hash would
         // lead to lots of conflicts.
-        unsigned hash = reinterpret_cast<uintptr_t>(this);
+        unsigned hash = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(this));
         hash <<= s_flagCount;
         if (!hash)