[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8cf52fec81dd3f5daeeda83960f3dffd061125b8
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 20:47:46 2010 +0000

    clang++ build fixes for JavaScriptCore and WebCore
    https://bugs.webkit.org/show_bug.cgi?id=42478
    
    Reviewed by Sam Weinig.
    
    JavaScriptCore:
    
    * runtime/RegExpKey.h:
    (JSC::operator==):
    Move the RegExpKey equals operator into the JSC namespace so it can be found by ADL.
    
    WebCore:
    
    * platform/network/Credential.cpp:
    (WebCore::Credential::type):
    * platform/network/Credential.h:
    Remove const qualifier on Credential::type since it doesn't have an effect on the type.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63578 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 78c7dbc..8c6d414 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -24,6 +24,17 @@
 
 2010-07-16  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Sam Weinig.
+
+        clang++ build fixes for JavaScriptCore and WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=42478
+
+        * runtime/RegExpKey.h:
+        (JSC::operator==):
+        Move the RegExpKey equals operator into the JSC namespace so it can be found by ADL.
+
+2010-07-16  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by David Levin.
 
         Really add WARN_UNUSED_RESULT to leakRef
diff --git a/JavaScriptCore/runtime/RegExpKey.h b/JavaScriptCore/runtime/RegExpKey.h
index e5ab438..2bbdb07 100644
--- a/JavaScriptCore/runtime/RegExpKey.h
+++ b/JavaScriptCore/runtime/RegExpKey.h
@@ -76,13 +76,8 @@ struct RegExpKey {
         return flagsValue;
     }
 };
-} // namespace JSC
-
-namespace WTF {
-template<typename T> struct DefaultHash;
-template<typename T> struct RegExpHash;
 
-inline bool operator==(const JSC::RegExpKey& a, const JSC::RegExpKey& b) 
+inline bool operator==(const RegExpKey& a, const RegExpKey& b) 
 {
     if (a.flagsValue != b.flagsValue)
         return false;
@@ -93,6 +88,12 @@ inline bool operator==(const JSC::RegExpKey& a, const JSC::RegExpKey& b)
     return equal(a.pattern.get(), b.pattern.get());
 }
 
+} // namespace JSC
+
+namespace WTF {
+template<typename T> struct DefaultHash;
+template<typename T> struct RegExpHash;
+
 template<> struct RegExpHash<JSC::RegExpKey> {
     static unsigned hash(const JSC::RegExpKey& key) { return key.pattern->hash(); }
     static bool equal(const JSC::RegExpKey& a, const JSC::RegExpKey& b) { return a == b; }
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4353546..0a256b1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -147,6 +147,18 @@
 
 2010-07-16  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Sam Weinig.
+
+        clang++ build fixes for JavaScriptCore and WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=42478
+
+        * platform/network/Credential.cpp:
+        (WebCore::Credential::type):
+        * platform/network/Credential.h:
+        Remove const qualifier on Credential::type since it doesn't have an effect on the type.
+
+2010-07-16  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by David Levin.
 
         Really add WARN_UNUSED_RESULT to leakRef
diff --git a/WebCore/platform/network/Credential.cpp b/WebCore/platform/network/Credential.cpp
index 87cd7ff..4b24403 100644
--- a/WebCore/platform/network/Credential.cpp
+++ b/WebCore/platform/network/Credential.cpp
@@ -114,7 +114,7 @@ CFArrayRef Credential::certificates() const
     return m_certificates.get();
 }
     
-const CredentialType Credential::type() const
+CredentialType Credential::type() const
 {
     return m_type;
 }
diff --git a/WebCore/platform/network/Credential.h b/WebCore/platform/network/Credential.h
index 199817c..4fb8bfd 100644
--- a/WebCore/platform/network/Credential.h
+++ b/WebCore/platform/network/Credential.h
@@ -69,7 +69,7 @@ public:
 #if CERTIFICATE_CREDENTIALS_SUPPORTED
     SecIdentityRef identity() const;
     CFArrayRef certificates() const;
-    const CredentialType type() const;
+    CredentialType type() const;
 #endif    
     
 private:

-- 
WebKit Debian packaging