Title: [128829] trunk/Source/WTF
Revision
128829
Author
[email protected]
Date
2012-09-17 17:40:03 -0700 (Mon, 17 Sep 2012)

Log Message

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

Patch by Glenn Adams <[email protected]> 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.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (128828 => 128829)


--- trunk/Source/WTF/ChangeLog	2012-09-18 00:35:35 UTC (rev 128828)
+++ trunk/Source/WTF/ChangeLog	2012-09-18 00:40:03 UTC (rev 128829)
@@ -1,3 +1,19 @@
+2012-09-17  Glenn Adams  <[email protected]>
+
+        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  <[email protected]>
 
         The ThreadRescrictionVerifier should be more forcibly disabled on systems that use threads

Modified: trunk/Source/WTF/wtf/HexNumber.h (128828 => 128829)


--- trunk/Source/WTF/wtf/HexNumber.h	2012-09-18 00:35:35 UTC (rev 128828)
+++ trunk/Source/WTF/wtf/HexNumber.h	2012-09-18 00:40:03 UTC (rev 128829)
@@ -31,10 +31,10 @@
 
 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;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to