Changeset 50700 in webkit

Timestamp:

Nov 9, 2009 5:24:59 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-09 Martin Robinson <​martin.james.robinson@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorResource.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-09  Martin Robinson  <martin.james.robinson@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@apple.com>
 

trunk/WebCore/inspector/InspectorResource.h

@@ -126 +126 @@
             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)