Changeset 24058 in webkit

Timestamp:

Jul 6, 2007 4:42:53 AM (17 years ago)

Author:

bdash

Message:

2007-07-06 Bernhard Rosenkraenzer <​bero@arklinux.org>

Reviewed by Sam.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=13985
Bug 13985: WebCore/rendering/RenderTable.cpp fails to compile with gcc 4.2.x

• rendering/RenderTable.cpp: (WebKit::RenderTable::calcBorderLeft) (WebKit::RenderTable::calcBorderRight)

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-06  Bernhard Rosenkraenzer  <bero@arklinux.org>
+
+        Reviewed by Sam.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=13985
+        Bug 13985: WebCore/rendering/RenderTable.cpp fails to compile with gcc 4.2.x
+
+        * rendering/RenderTable.cpp:
+        (WebKit::RenderTable::calcBorderLeft)
+        (WebKit::RenderTable::calcBorderRight)
+
 2007-07-06  Maxime Britto  <mbritto@pleyo.com>
 

trunk/WebCore/rendering/RenderTable.cpp

@@ -723 +723 @@
                 return 0;
             if (gb.style() > BHIDDEN)
-                borderWidth = max(borderWidth, gb.width);
+                borderWidth = max(borderWidth, static_cast<unsigned>(gb.width));
         }
         
@@ -736 +736 @@
 
             if (sb.style() > BHIDDEN)
-                borderWidth = max(borderWidth, sb.width);
+                borderWidth = max(borderWidth, static_cast<unsigned>(sb.width));
 
             const RenderTableSection::CellStruct& cs = firstNonEmptySection->cellAt(0, leftmostColumn);
@@ -750 +750 @@
 
                 if (cb.style() > BHIDDEN)
-                    borderWidth = max(borderWidth, cb.width);
+                    borderWidth = max(borderWidth, static_cast<unsigned>(cb.width));
                 if (rb.style() > BHIDDEN)
-                    borderWidth = max(borderWidth, rb.width);
+                    borderWidth = max(borderWidth, static_cast<unsigned>(rb.width));
             }
         }
@@ -782 +782 @@
                 return 0;
             if (gb.style() > BHIDDEN)
-                borderWidth = max(borderWidth, gb.width);
+                borderWidth = max(borderWidth, static_cast<unsigned>(gb.width));
         }
         
@@ -795 +795 @@
 
             if (sb.style() > BHIDDEN)
-                borderWidth = max(borderWidth, sb.width);
+                borderWidth = max(borderWidth, static_cast<unsigned>(sb.width));
 
             const RenderTableSection::CellStruct& cs = firstNonEmptySection->cellAt(0, rightmostColumn);
@@ -809 +809 @@
 
                 if (cb.style() > BHIDDEN)
-                    borderWidth = max(borderWidth, cb.width);
+                    borderWidth = max(borderWidth, static_cast<unsigned>(cb.width));
                 if (rb.style() > BHIDDEN)
-                    borderWidth = max(borderWidth, rb.width);
+                    borderWidth = max(borderWidth, static_cast<unsigned>(rb.width));
             }
         }