[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 30f9bf080a55a18c6658d9591bc48a72374d95bd
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 08:34:11 2009 +0000

    Partial WINSCW build fix.
    
    Patch by Janne Koskinen <janne.p.koskinen at digia.com> on 2009-10-02
    Reviewed by Simon Hausmann.
    
    Add parentheses around the function pointer declaration, similar to the
    second hunk in r48825.
    
    * loader/CachedResourceHandle.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 59fa26a..aa5f0a6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-02  Janne Koskinen <janne.p.koskinen at digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Partial WINSCW build fix.
+
+        Add parentheses around the function pointer declaration, similar to the
+        second hunk in r48825.
+
+        * loader/CachedResourceHandle.h:
+
 2009-10-02  Adam Barth  <abarth at webkit.org>
 
         Unreviewed attempted build fix by Xcode magic.
diff --git a/WebCore/loader/CachedResourceHandle.h b/WebCore/loader/CachedResourceHandle.h
index 13c03c7..9d45b94 100644
--- a/WebCore/loader/CachedResourceHandle.h
+++ b/WebCore/loader/CachedResourceHandle.h
@@ -38,7 +38,8 @@ namespace WebCore {
         bool operator!() const { return !m_resource; }
         
         // This conversion operator allows implicit conversion to bool but not to other integer types.
-        typedef CachedResource* CachedResourceHandleBase::*UnspecifiedBoolType;
+        // Parenthesis is needed for winscw compiler to resolve class qualifier in this case.
+        typedef CachedResource* (CachedResourceHandleBase::*UnspecifiedBoolType);
         operator UnspecifiedBoolType() const { return m_resource ? &CachedResourceHandleBase::m_resource : 0; }
 
     protected:

-- 
WebKit Debian packaging