[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2c26a06ad5e21ea1305257b0ecb839cc4be65e2f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 10 01:24:59 2009 +0000

    2009-11-09  Martin Robinson  <martin.james.robinson at gmail.com>
    
            Reviewed by Darin Adler.
    
            Compiler warnings in InspectorResource.h
            https://bugs.webkit.org/show_bug.cgi?id=29231
    
            Fix compilation warnings by removing addition operation on an enum type.
    
            * inspector/InspectorResource.h:
            (WebCore::InspectorResource::):
            (WebCore::InspectorResource::Changes::hasChange):
            (WebCore::InspectorResource::Changes::set):
            (WebCore::InspectorResource::Changes::setAll):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50700 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c32b001..ddd020a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-09  Martin Robinson  <martin.james.robinson at gmail.com>
+
+        Reviewed by Darin Adler.
+
+        Compiler warnings in InspectorResource.h
+        https://bugs.webkit.org/show_bug.cgi?id=29231
+
+        Fix compilation warnings by removing addition operation on an enum type.
+
+        * inspector/InspectorResource.h:
+        (WebCore::InspectorResource::):
+        (WebCore::InspectorResource::Changes::hasChange):
+        (WebCore::InspectorResource::Changes::set):
+        (WebCore::InspectorResource::Changes::setAll):
+
 2009-11-09  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Darin Adler and Dan Bernstein.
diff --git a/WebCore/inspector/InspectorResource.h b/WebCore/inspector/InspectorResource.h
index 979fbb0..8aad900 100644
--- a/WebCore/inspector/InspectorResource.h
+++ b/WebCore/inspector/InspectorResource.h
@@ -125,10 +125,13 @@ namespace WebCore {
         public:
             Changes() : m_change(NoChange) {}
 
-            inline bool hasChange(ChangeType change) { return (m_change & change) || !(m_change + change); }
+            inline bool hasChange(ChangeType change)
+            {
+                return m_change & change || (m_change == NoChange && change == NoChange);
+            }
             inline void set(ChangeType change)
             {
-                m_change = static_cast<ChangeType>(static_cast<unsigned>(m_change) | static_cast<unsigned>(change));            
+                m_change = static_cast<ChangeType>(static_cast<unsigned>(m_change) | static_cast<unsigned>(change));
             }
             inline void clear(ChangeType change)
             {

-- 
WebKit Debian packaging