Changeset 128829 in webkit

Timestamp:

Sep 17, 2012 5:40:03 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Including HexNumber.h fails build if hexDigitsForMode is not referenced
​https://bugs.webkit.org/show_bug.cgi?id=96873

Patch by Glenn Adams <​glenn@skynav.com> on 2012-09-17
Reviewed by Benjamin Poulain.

Ensure release build is possible when hexDigitsForMode is not referenced by
template expansion.

• wtf/HexNumber.h:

(WTF::Internal::hexDigitsForMode):
Change hexDigitsForMode to inline (rather than static). Make string literals
{lower,upper}HexDigits non-local and non-static, but const, to which the linker
should merge references in the RO data segment.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/HexNumber.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-09-17  Glenn Adams  <glenn@skynav.com>
+
+        Including HexNumber.h fails build if hexDigitsForMode is not referenced
+        https://bugs.webkit.org/show_bug.cgi?id=96873
+
+        Reviewed by Benjamin Poulain.
+
+        Ensure release build is possible when hexDigitsForMode is not referenced by
+        template expansion.
+
+        * wtf/HexNumber.h:
+        (WTF::Internal::hexDigitsForMode):
+        Change hexDigitsForMode to inline (rather than static). Make string literals
+        {lower,upper}HexDigits non-local and non-static, but const, to which the linker
+        should merge references in the RO data segment.
+
 2012-09-17  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/HexNumber.h

@@ -32 +32 @@
 namespace Internal {
 
-static const char* hexDigitsForMode(HexConversionMode mode)
+const char lowerHexDigits[17] = "0123456789abcdef";
+const char upperHexDigits[17] = "0123456789ABCDEF";
+inline const char* hexDigitsForMode(HexConversionMode mode)
 {
-    static const char lowerHexDigits[17] = "0123456789abcdef";
-    static const char upperHexDigits[17] = "0123456789ABCDEF";
     return mode == Lowercase ? lowerHexDigits : upperHexDigits;
 }