Changeset 35777 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 15, 2008, 3:18:06 AM (17 years ago)

Author:

[email protected]

Message:

More build fixes.

• API/OpaqueJSString.h: Add a namespace to friend declaration to appease MSVC.
• API/JSStringRefCF.h: (JSStringCreateWithCFString) Cast UniChar* to UChar* explicitly.
• JavaScriptCore.exp: Added OpaqueJSString::create(const KJS::UString&) to fix WebCore build.

Location:

trunk/JavaScriptCore

Files:

• API/JSStringRefCF.cpp (modified) (1 diff)
• API/OpaqueJSString.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)

trunk/JavaScriptCore/API/JSStringRefCF.cpp

@@ -42 +42 @@
         CFStringGetCharacters(string, CFRangeMake(0, length), buffer.get());
         COMPILE_ASSERT(sizeof(UniChar) == sizeof(UChar), unichar_and_uchar_must_be_same_size);
-        return OpaqueJSString::create(buffer.get(), length).releaseRef();
+        return OpaqueJSString::create(reinterpret_cast<UChar*>(buffer.get()), length).releaseRef();
     } else {
         return OpaqueJSString::create(0, 0).releaseRef();

trunk/JavaScriptCore/API/OpaqueJSString.h

@@ -58 +58 @@
 
 private:
-    friend class ThreadSafeShared<OpaqueJSString>;
+    friend class WTF::ThreadSafeShared<OpaqueJSString>;
 
     OpaqueJSString()

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-08-15  Alexey Proskuryakov  <[email protected]>
+
+        More build fixes.
+
+        * API/OpaqueJSString.h: Add a namespace to friend declaration to appease MSVC.
+        * API/JSStringRefCF.h: (JSStringCreateWithCFString) Cast UniChar* to UChar* explicitly.
+        * JavaScriptCore.exp: Added OpaqueJSString::create(const KJS::UString&) to fix WebCore build.
+
 2008-08-15  Alexey Proskuryakov  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -77 +77 @@
 __Z15jsRegExpCompilePKti24JSRegExpIgnoreCaseOption23JSRegExpMultilineOptionPjPPKc
 __Z15jsRegExpExecutePK8JSRegExpPKtiiPii
+__ZN14OpaqueJSString6createERKN3KJS7UStringE
 __ZN3KJS10Identifier11addSlowCaseEPNS_12JSGlobalDataEPNS_7UString3RepE
 __ZN3KJS10Identifier11addSlowCaseEPNS_9ExecStateEPNS_7UString3RepE