BUILD FIX (r144727): Change type of columnRange and rowRange to pair<unsigned, unsigned>

<http://webkit.org/b/110050>

Fixes the following build failures:

    Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:741:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
        tableCell->rowIndexRange(rowRange);
                                 ^~~~~~~~
    In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
    Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here
        virtual void rowIndexRange(pair<unsigned, unsigned>& rowRange);
                                                             ^
    Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:742:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
        tableCell->columnIndexRange(columnRange);
                                    ^~~~~~~~~~~
    In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
    Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here
        virtual void columnIndexRange(pair<unsigned, unsigned>& columnRange);
                                                                ^
    Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:804:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
        tableCell->rowIndexRange(rowRange);
                                 ^~~~~~~~
    In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
    Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here
        virtual void rowIndexRange(pair<unsigned, unsigned>& rowRange);
                                                             ^
    Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:818:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
        tableCell->columnIndexRange(columnRange);
                                    ^~~~~~~~~~~
    In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
    Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here
        virtual void columnIndexRange(pair<unsigned, unsigned>& columnRange);
                                                    ^
    4 errors generated.

* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
(-[WebAccessibilityObjectWrapper accessibilityRowRange]):
(-[WebAccessibilityObjectWrapper accessibilityColumnRange]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 05a25341dbbb2f9f1df625652407f2003ef50399..bbb86397cf27d8bce33c2063dc6c1429890413b6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,45 @@
+2013-03-05  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX (r144727): Change type of columnRange and rowRange to pair<unsigned, unsigned>
+        <http://webkit.org/b/110050>
+
+        Fixes the following build failures:
+
+            Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:741:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+                tableCell->rowIndexRange(rowRange);
+                                         ^~~~~~~~
+            In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
+            Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here
+                virtual void rowIndexRange(pair<unsigned, unsigned>& rowRange);
+                                                                     ^
+            Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:742:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+                tableCell->columnIndexRange(columnRange);
+                                            ^~~~~~~~~~~
+            In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
+            Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here
+                virtual void columnIndexRange(pair<unsigned, unsigned>& columnRange);
+                                                                        ^
+            Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:804:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+                tableCell->rowIndexRange(rowRange);
+                                         ^~~~~~~~
+            In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
+            Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here
+                virtual void rowIndexRange(pair<unsigned, unsigned>& rowRange);
+                                                                     ^
+            Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:818:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+                tableCell->columnIndexRange(columnRange);
+                                            ^~~~~~~~~~~
+            In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33:
+            Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here
+                virtual void columnIndexRange(pair<unsigned, unsigned>& columnRange);
+                                                            ^
+            4 errors generated.
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
+        (-[WebAccessibilityObjectWrapper accessibilityRowRange]):
+        (-[WebAccessibilityObjectWrapper accessibilityColumnRange]):
+
 2013-03-04  Andrey Kosyakov  <caseq@chromium.org>
 
         Web Inspector: [refactoring] set frame identifiers in timeline records early, do not keep them in event stack

diff --git a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
index 6034e0f0f36554babddb7feeb8371b01ba6d5251..5c944a9d3cb9b8efb042695db9c99500f34e0559 100644 (file)
--- a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
+++ b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
@@ -736,8 +736,8 @@ static AccessibilityObjectWrapper* AccessibilityUnignoredAncestor(AccessibilityO
         return nil;
     
     // Get the row and column range, so we can use them to find the headers.
-    pair<int, int> rowRange;
-    pair<int, int> columnRange;
+    pair<unsigned, unsigned> rowRange;
+    pair<unsigned, unsigned> columnRange;
     tableCell->rowIndexRange(rowRange);
     tableCell->columnIndexRange(columnRange);
     
@@ -800,7 +800,7 @@ static AccessibilityObjectWrapper* AccessibilityUnignoredAncestor(AccessibilityO
     if (!tableCell)
         return NSMakeRange(NSNotFound, 0);
     
-    pair<int, int> rowRange;
+    pair<unsigned, unsigned> rowRange;
     tableCell->rowIndexRange(rowRange);
     return NSMakeRange(rowRange.first, rowRange.second);
 }
@@ -814,7 +814,7 @@ static AccessibilityObjectWrapper* AccessibilityUnignoredAncestor(AccessibilityO
     if (!tableCell)
         return NSMakeRange(NSNotFound, 0);
     
-    pair<int, int> columnRange;
+    pair<unsigned, unsigned> columnRange;
     tableCell->columnIndexRange(columnRange);
     return NSMakeRange(columnRange.first, columnRange.second);
 }