[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8a7d2c0c21de7052d86f54f379c898c0f21d99b7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 15:33:41 2010 +0000

    2010-01-04  Yongjun Zhang  <yongjun.zhang at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            https://bugs.webkit.org/show_bug.cgi?id=29048
            [Qt] make RenderStyle.h compile in winscw compiler.
    
            Change compareEqual to a macro in Winscw compiler to get around "illegal operand"
            error when compareEqual is defined as template.
    
            The compiler bug is reported at:
            https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10447
    
            * rendering/style/RenderStyle.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 910827f..4931bda 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-04  Yongjun Zhang  <yongjun.zhang at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29048
+        [Qt] make RenderStyle.h compile in winscw compiler.
+
+        Change compareEqual to a macro in Winscw compiler to get around "illegal operand" 
+        error when compareEqual is defined as template.
+
+        The compiler bug is reported at:
+        https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10447
+
+        * rendering/style/RenderStyle.h:
+
 2010-01-04  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index da434ea..2682bb3 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -89,7 +89,11 @@
 #include "BindingURI.h"
 #endif
 
+#if COMPILER(WINSCW)
+#define compareEqual(t, u)      ((t) == (u))
+#else
 template<typename T, typename U> inline bool compareEqual(const T& t, const U& u) { return t == static_cast<T>(u); }
+#endif
 
 #define SET_VAR(group, variable, value) \
     if (!compareEqual(group->variable, value)) \

-- 
WebKit Debian packaging