[webkit-changes] [171696] trunk/Source/WTF

Mon, 28 Jul 2014 14:48:06 -0700

Title: [171696] trunk/Source/WTF
Revision
171696
Author
[email protected]
Date
2014-07-28 14:47:32 -0700 (Mon, 28 Jul 2014)

Log Message

Should not export symbols for base64Encode inline adapter methods
https://bugs.webkit.org/show_bug.cgi?id=135355

Unreviewed build fix.

Fixes the build break introduced by r171682, where a base64Encode
inline adapter method was used in another header, thus creating
multiple definitions of it (and problems with with weak symbols).

* wtf/text/Base64.h: Remove WTF_EXPORT_PRIVATE for inlined methods.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (171695 => 171696)


--- trunk/Source/WTF/ChangeLog	2014-07-28 21:47:05 UTC (rev 171695)
+++ trunk/Source/WTF/ChangeLog	2014-07-28 21:47:32 UTC (rev 171696)
@@ -1,3 +1,16 @@
+2014-07-28  Brian J. Burg  <[email protected]>
+
+        Should not export symbols for base64Encode inline adapter methods
+        https://bugs.webkit.org/show_bug.cgi?id=135355
+
+        Unreviewed build fix.
+
+        Fixes the build break introduced by r171682, where a base64Encode
+        inline adapter method was used in another header, thus creating
+        multiple definitions of it (and problems with with weak symbols).
+
+        * wtf/text/Base64.h: Remove WTF_EXPORT_PRIVATE for inlined methods.
+
 2014-07-27  Filip Pizlo  <[email protected]>
 
         Merge r170090, r170092, r170129, r170141, r170161, r170215, r170275, r170375, r170376, r170382, r170383, r170399, r170436, r170489, r170490, r170556 from ftlopt.

Modified: trunk/Source/WTF/wtf/text/Base64.h (171695 => 171696)


--- trunk/Source/WTF/wtf/text/Base64.h	2014-07-28 21:47:05 UTC (rev 171695)
+++ trunk/Source/WTF/wtf/text/Base64.h	2014-07-28 21:47:32 UTC (rev 171696)
@@ -79,11 +79,11 @@
 };
 
 WTF_EXPORT_PRIVATE void base64Encode(const void*, unsigned, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
-WTF_EXPORT_PRIVATE void base64Encode(ConstSignedOrUnsignedCharVectorAdapter, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
-WTF_EXPORT_PRIVATE void base64Encode(const CString&, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
+void base64Encode(ConstSignedOrUnsignedCharVectorAdapter, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
+void base64Encode(const CString&, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
 WTF_EXPORT_PRIVATE String base64Encode(const void*, unsigned, Base64EncodePolicy = Base64DoNotInsertLFs);
-WTF_EXPORT_PRIVATE String base64Encode(ConstSignedOrUnsignedCharVectorAdapter, Base64EncodePolicy = Base64DoNotInsertLFs);
-WTF_EXPORT_PRIVATE String base64Encode(const CString&, Base64EncodePolicy = Base64DoNotInsertLFs);
+String base64Encode(ConstSignedOrUnsignedCharVectorAdapter, Base64EncodePolicy = Base64DoNotInsertLFs);
+String base64Encode(const CString&, Base64EncodePolicy = Base64DoNotInsertLFs);
 
 WTF_EXPORT_PRIVATE bool base64Decode(const String&, SignedOrUnsignedCharVectorAdapter, Base64DecodePolicy = Base64FailOnInvalidCharacter);
 WTF_EXPORT_PRIVATE bool base64Decode(const Vector<char>&, SignedOrUnsignedCharVectorAdapter, Base64DecodePolicy = Base64FailOnInvalidCharacter);
@@ -115,11 +115,12 @@
 // ======================================================================================
 
 WTF_EXPORT_PRIVATE void base64URLEncode(const void*, unsigned, Vector<char>&);
-WTF_EXPORT_PRIVATE void base64URLEncode(ConstSignedOrUnsignedCharVectorAdapter, Vector<char>&);
-WTF_EXPORT_PRIVATE void base64URLEncode(const CString&, Vector<char>&);
+void base64URLEncode(ConstSignedOrUnsignedCharVectorAdapter, Vector<char>&);
+void base64URLEncode(const CString&, Vector<char>&);
+
 WTF_EXPORT_PRIVATE String base64URLEncode(const void*, unsigned);
-WTF_EXPORT_PRIVATE String base64URLEncode(ConstSignedOrUnsignedCharVectorAdapter);
-WTF_EXPORT_PRIVATE String base64URLEncode(const CString&);
+String base64URLEncode(ConstSignedOrUnsignedCharVectorAdapter);
+String base64URLEncode(const CString&);
 
 WTF_EXPORT_PRIVATE bool base64URLDecode(const String&, SignedOrUnsignedCharVectorAdapter);
 WTF_EXPORT_PRIVATE bool base64URLDecode(const Vector<char>&, SignedOrUnsignedCharVectorAdapter);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to